Browse Source

AMBARI-5031. gmetad/gmond left in init after install.(vbrodetskyi)

Vitaly Brodetskyi 11 years ago
parent
commit
ad28c4e4ef

+ 3 - 0
ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/ganglia_monitor.py

@@ -160,6 +160,9 @@ class GangliaMonitor(Script):
     Execute("chkconfig gmond off",
             path='/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin')
 
+    Execute("chkconfig gmetad off",
+            path='/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin')
+
 
 if __name__ == "__main__":
   GangliaMonitor().execute()

+ 3 - 0
ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/ganglia_monitor.py

@@ -187,6 +187,9 @@ class GangliaMonitor(Script):
     Execute("chkconfig gmond off",
             path='/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin')
 
+    Execute("chkconfig gmetad off",
+            path='/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin')
+
 
 if __name__ == "__main__":
   GangliaMonitor().execute()

+ 2 - 0
ambari-server/src/test/python/stacks/1.3.2/GANGLIA/test_ganglia_monitor.py

@@ -552,4 +552,6 @@ class TestGangliaMonitor(RMFTestCase):
     self.assertResourceCalled('Execute', 'chkconfig gmond off',
                               path = ['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'],)
 
+    self.assertResourceCalled('Execute', 'chkconfig gmetad off',
+                              path = ['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'],)
     self.assertNoMoreResources()

+ 3 - 0
ambari-server/src/test/python/stacks/2.0.6/GANGLIA/test_ganglia_monitor.py

@@ -465,4 +465,7 @@ class TestGangliaMonitor(RMFTestCase):
 
     self.assertResourceCalled('Execute', 'chkconfig gmond off',
                           path = ['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'],)
+
+    self.assertResourceCalled('Execute', 'chkconfig gmetad off',
+                              path = ['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'],)
     self.assertNoMoreResources()