ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject [1/5] git commit: AMBARI-4483. Remove hard coded storm rpm fetch for Storm to use yum directly (Arsen Babych via aonishuk)
Date Mon, 03 Feb 2014 16:44:14 GMT
Updated Branches:
  refs/heads/trunk 0224d15d5 -> 0de2e012b


AMBARI-4483. Remove hard coded storm rpm fetch for Storm to use yum
directly (Arsen Babych via aonishuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/36ebaad2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/36ebaad2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/36ebaad2

Branch: refs/heads/trunk
Commit: 36ebaad2438da9bda295c8a93d1e69fe68e44b9c
Parents: 97783f7
Author: Andrew Onischuk <aonishuk@hortonworks.com>
Authored: Mon Feb 3 08:18:48 2014 -0800
Committer: Andrew Onischuk <aonishuk@hortonworks.com>
Committed: Mon Feb 3 08:44:00 2014 -0800

----------------------------------------------------------------------
 .../main/resources/stacks/HDP/2.1.1/services/STORM/metainfo.xml  | 4 ++--
 .../HDP/2.1.1/services/STORM/package/scripts/drpc_server.py      | 4 ----
 .../HDP/2.1.1/services/STORM/package/scripts/logviewer_server.py | 4 ----
 .../stacks/HDP/2.1.1/services/STORM/package/scripts/nimbus.py    | 4 ----
 .../HDP/2.1.1/services/STORM/package/scripts/supervisor.py       | 3 ---
 .../stacks/HDP/2.1.1/services/STORM/package/scripts/ui_server.py | 4 ----
 6 files changed, 2 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/36ebaad2/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/metainfo.xml
b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/metainfo.xml
index 95dd954..a15d3a1 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/metainfo.xml
@@ -77,7 +77,6 @@
       </components>
 
 
-      <!--
       <osSpecifics>
         <osSpecific>
           <osType>any</osType>
@@ -86,8 +85,9 @@
               <type>rpm</type>
               <name>storm</name>
             </package>
+          </packages>
         </osSpecific>
-      </osSpecifics> -->
+      </osSpecifics>
 
       <commandScript>
         <script>scripts/service_check.py</script>

http://git-wip-us.apache.org/repos/asf/ambari/blob/36ebaad2/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/drpc_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/drpc_server.py
b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/drpc_server.py
index 325f86a..149b212 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/drpc_server.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/drpc_server.py
@@ -28,10 +28,6 @@ from service_check import ServiceCheck
 class DrpcServer(Script):
   def install(self, env):
     self.install_packages(env)
-    # TODO remove
-    Execute("yum install http://s3.amazonaws.com/dev.hortonworks.com/storm/storm-0.9.1.2.0.6.1-1.el6.noarch.rpm
-y",
-            ignore_failures = True)
-
     self.configure(env)
 
   def configure(self, env):

http://git-wip-us.apache.org/repos/asf/ambari/blob/36ebaad2/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/logviewer_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/logviewer_server.py
b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/logviewer_server.py
index c209036..9284ce4 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/logviewer_server.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/logviewer_server.py
@@ -28,10 +28,6 @@ from service_check import ServiceCheck
 class LogviewerServer(Script):
   def install(self, env):
     self.install_packages(env)
-    # TODO remove
-    Execute("yum install http://s3.amazonaws.com/dev.hortonworks.com/storm/storm-0.9.1.2.0.6.1-1.el6.noarch.rpm
-y",
-            ignore_failures = True)
-
     self.configure(env)
 
   def configure(self, env):

http://git-wip-us.apache.org/repos/asf/ambari/blob/36ebaad2/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/nimbus.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/nimbus.py
b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/nimbus.py
index 7210314..4ddc28f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/nimbus.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/nimbus.py
@@ -28,10 +28,6 @@ from service_check import ServiceCheck
 class Nimbus(Script):
   def install(self, env):
     self.install_packages(env)
-    # TODO remove
-    Execute("yum install http://s3.amazonaws.com/dev.hortonworks.com/storm/storm-0.9.1.2.0.6.1-1.el6.noarch.rpm
-y",
-            ignore_failures = True)
-
     self.configure(env)
 
   def configure(self, env):

http://git-wip-us.apache.org/repos/asf/ambari/blob/36ebaad2/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/supervisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/supervisor.py
b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/supervisor.py
index eafb48f..a1f3cca 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/supervisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/supervisor.py
@@ -28,9 +28,6 @@ from service import service
 class Supervisor(Script):
   def install(self, env):
     self.install_packages(env)
-    # TODO remove
-    Execute("yum install http://s3.amazonaws.com/dev.hortonworks.com/storm/storm-0.9.1.2.0.6.1-1.el6.noarch.rpm
-y",
-            ignore_failures = True)
     self.configure(env)
 
   def configure(self, env):

http://git-wip-us.apache.org/repos/asf/ambari/blob/36ebaad2/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/ui_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/ui_server.py
b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/ui_server.py
index 58deec6..6a9d923 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/ui_server.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/ui_server.py
@@ -28,10 +28,6 @@ from service_check import ServiceCheck
 class UiServer(Script):
   def install(self, env):
     self.install_packages(env)
-    # TODO remove
-    Execute("yum install http://s3.amazonaws.com/dev.hortonworks.com/storm/storm-0.9.1.2.0.6.1-1.el6.noarch.rpm
-y",
-            ignore_failures = True)
-
     self.configure(env)
 
   def configure(self, env):


Mime
View raw message