AMBARI-4870. Nimbus fails to start on install on centos 5.9. (Iryna Kuzmenko via mahadev)

ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/service.py

@@ -46,14 +46,13 @@ def service(
     if name == "rest_api":
       cmd = format("env PATH=$PATH:{java64_home}/bin {process_cmd} {rest_api_conf_file} > {log_dir}/restapi.log")
     else:
-      cmd = format("env PATH=$PATH:{java64_home}/bin /usr/bin/storm {name}")
+      cmd = format("env JAVA_HOME={java64_home} /usr/bin/storm {name}")
 
     Execute(cmd,
            not_if=no_op_test,
            user=params.storm_user,
            wait_for_finish=False
     )
-
     Execute(crt_pid_cmd,
             user=params.storm_user,
             logoutput=True,

ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_drpc_server.py

@@ -43,7 +43,7 @@ class TestStormDrpcServer(RMFTestCase):
 
     self.assert_configure_default()
 
-    self.assertResourceCalled('Execute', 'env PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm drpc',
+    self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/bin/storm drpc',
       wait_for_finish = False,
       not_if = 'ls /var/run/storm/drpc.pid >/dev/null 2>&1 && ps `cat /var/run/storm/drpc.pid` >/dev/null 2>&1',
       user = 'storm',
@@ -92,7 +92,7 @@ class TestStormDrpcServer(RMFTestCase):
 
     self.assert_configure_secured()
 
-    self.assertResourceCalled('Execute', 'env PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm drpc',
+    self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/bin/storm drpc',
       wait_for_finish = False,
       not_if = 'ls /var/run/storm/drpc.pid >/dev/null 2>&1 && ps `cat /var/run/storm/drpc.pid` >/dev/null 2>&1',
       user = 'storm',

ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_logviewer_server.py

@@ -43,7 +43,7 @@ class TestStormLogviewerServer(RMFTestCase):
 
     self.assert_configure_default()
 
-    self.assertResourceCalled('Execute', 'env PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm logviewer',
+    self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/bin/storm logviewer',
       wait_for_finish = False,
       not_if = 'ls /var/run/storm/logviewer.pid >/dev/null 2>&1 && ps `cat /var/run/storm/logviewer.pid` >/dev/null 2>&1',
       user = 'storm',
@@ -92,7 +92,7 @@ class TestStormLogviewerServer(RMFTestCase):
 
     self.assert_configure_secured()
 
-    self.assertResourceCalled('Execute', 'env PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm logviewer',
+    self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/bin/storm logviewer',
       wait_for_finish = False,
       not_if = 'ls /var/run/storm/logviewer.pid >/dev/null 2>&1 && ps `cat /var/run/storm/logviewer.pid` >/dev/null 2>&1',
       user = 'storm',

ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_nimbus.py

@@ -43,7 +43,7 @@ class TestStormNimbus(RMFTestCase):
 
     self.assert_configure_default()
 
-    self.assertResourceCalled('Execute', 'env PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm nimbus',
+    self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/bin/storm nimbus',
       wait_for_finish = False,
       not_if = 'ls /var/run/storm/nimbus.pid >/dev/null 2>&1 && ps `cat /var/run/storm/nimbus.pid` >/dev/null 2>&1',
       user = 'storm',
@@ -92,7 +92,7 @@ class TestStormNimbus(RMFTestCase):
 
     self.assert_configure_secured()
 
-    self.assertResourceCalled('Execute', 'env PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm nimbus',
+    self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/bin/storm nimbus',
       wait_for_finish = False,
       not_if = 'ls /var/run/storm/nimbus.pid >/dev/null 2>&1 && ps `cat /var/run/storm/nimbus.pid` >/dev/null 2>&1',
       user = 'storm',

ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_supervisor.py

@@ -43,7 +43,7 @@ class TestStormSupervisor(RMFTestCase):
 
     self.assert_configure_default()
 
-    self.assertResourceCalled('Execute', 'env PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm supervisor',
+    self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/bin/storm supervisor',
       wait_for_finish = False,
       not_if = 'ls /var/run/storm/supervisor.pid >/dev/null 2>&1 && ps `cat /var/run/storm/supervisor.pid` >/dev/null 2>&1',
       user = 'storm',
@@ -93,7 +93,7 @@ class TestStormSupervisor(RMFTestCase):
 
     self.assert_configure_secured()
 
-    self.assertResourceCalled('Execute', 'env PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm supervisor',
+    self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/bin/storm supervisor',
       wait_for_finish = False,
       not_if = 'ls /var/run/storm/supervisor.pid >/dev/null 2>&1 && ps `cat /var/run/storm/supervisor.pid` >/dev/null 2>&1',
       user = 'storm',

ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_ui_server.py

@@ -43,7 +43,7 @@ class TestStormUiServer(RMFTestCase):
 
     self.assert_configure_default()
 
-    self.assertResourceCalled('Execute', 'env PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm ui',
+    self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/bin/storm ui',
       wait_for_finish = False,
       not_if = 'ls /var/run/storm/ui.pid >/dev/null 2>&1 && ps `cat /var/run/storm/ui.pid` >/dev/null 2>&1',
       user = 'storm',
@@ -93,7 +93,7 @@ class TestStormUiServer(RMFTestCase):
 
     self.assert_configure_secured()
 
-    self.assertResourceCalled('Execute', 'env PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm ui',
+    self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/bin/storm ui',
       wait_for_finish = False,
       not_if = 'ls /var/run/storm/ui.pid >/dev/null 2>&1 && ps `cat /var/run/storm/ui.pid` >/dev/null 2>&1',
       user = 'storm',