AMBARI-3962. Ambari starting SNMPD during the installation, but not set it to autostart on boot. (aonishuk)

ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/hook.py

@@ -33,6 +33,7 @@ class BeforeConfigureHook(Hook):
     setup_hadoop()
     setup_configs()
     create_javahome_symlink()
+    init_services()
 
 if __name__ == "__main__":
   BeforeConfigureHook().execute()

ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/shared_initialization.py

@@ -70,11 +70,6 @@ def setup_hadoop():
   """
   import params
 
-  File(os.path.join(params.snmp_conf_dir, 'snmpd.conf'),
-       content=Template("snmpd.conf.j2"))
-  Service("snmpd",
-          action = "restart")
-
   Execute("/bin/echo 0 > /selinux/enforce",
           only_if="test -f /selinux/enforce"
   )
@@ -309,3 +304,12 @@ def create_javahome_symlink():
   if os.path.exists("/usr/jdk/jdk1.6.0_31") and not os.path.exists("/usr/jdk64/jdk1.6.0_31"):
     Execute("mkdir -p /usr/jdk64/")
     Execute("ln -s /usr/jdk/jdk1.6.0_31 /usr/jdk64/jdk1.6.0_31")
+
+def init_services():
+  import params
+  File(os.path.join(params.snmp_conf_dir, 'snmpd.conf'),
+       content=Template("snmpd.conf.j2"))
+  # enable snmpd
+  Execute( "service snmpd start; chkconfig snmpd on",
+    path = "/usr/local/bin/:/bin/:/sbin/"
+  )  

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/nagios.py

@@ -32,11 +32,6 @@ def nagios():
     content = Template("nagios.conf.j2"),
     mode   = 0644
   )
-
-  # enable snmpd
-  Execute( "service snmpd start; chkconfig snmpd on",
-    path = "/usr/local/bin/:/bin/:/sbin/"
-  )
   
   Directory( params.conf_dir,
     owner = params.nagios_user,

ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/hook.py

@@ -33,6 +33,7 @@ class BeforeConfigureHook(Hook):
     setup_hadoop()
     setup_configs()
     create_javahome_symlink()
+    init_services()
 
 if __name__ == "__main__":
   BeforeConfigureHook().execute()

ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py

@@ -70,11 +70,6 @@ def setup_hadoop():
   """
   import params
 
-  File(os.path.join(params.snmp_conf_dir, 'snmpd.conf'),
-       content=Template("snmpd.conf.j2"))
-  Service("snmpd",
-          action = "restart")
-
   Execute("/bin/echo 0 > /selinux/enforce",
           only_if="test -f /selinux/enforce"
   )
@@ -314,4 +309,13 @@ def install_snappy():
 def create_javahome_symlink():
   if os.path.exists("/usr/jdk/jdk1.6.0_31") and not os.path.exists("/usr/jdk64/jdk1.6.0_31"):
     Execute("mkdir -p /usr/jdk64/")
-    Execute("ln -s /usr/jdk/jdk1.6.0_31 /usr/jdk64/jdk1.6.0_31")
+    Execute("ln -s /usr/jdk/jdk1.6.0_31 /usr/jdk64/jdk1.6.0_31")
+
+def init_services():
+  import params
+  File(os.path.join(params.snmp_conf_dir, 'snmpd.conf'),
+       content=Template("snmpd.conf.j2"))
+  # enable snmpd
+  Execute( "service snmpd start; chkconfig snmpd on",
+    path = "/usr/local/bin/:/bin/:/sbin/"
+  )

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/nagios.py

@@ -32,11 +32,6 @@ def nagios():
     content = Template("nagios.conf.j2"),
     mode   = 0644
   )
-
-  # enable snmpd
-  Execute( "service snmpd start; chkconfig snmpd on",
-    path = "/usr/local/bin/:/bin/:/sbin/"
-  )
   
   Directory( params.conf_dir,
     owner = params.nagios_user,

ambari-server/src/test/python/stacks/1.3.2/NAGIOS/test_nagios_server.py

@@ -72,10 +72,6 @@ class TestNagiosServer(RMFTestCase):
                               content=Template("nagios.conf.j2"),
                               mode=0644
     )
-    self.assertResourceCalled('Execute',
-                              'service snmpd start; chkconfig snmpd on',
-                              path=['/usr/local/bin/:/bin/:/sbin/']
-    )
     self.assertResourceCalled('Directory', '/etc/nagios',
                               owner='nagios',
                               group='nagios',

ambari-server/src/test/python/stacks/1.3.2/hooks/before-START/test_before_start.py

@@ -42,12 +42,6 @@ class TestHookBeforeStart(RMFTestCase):
                               ignore_failures = True,
                               path = ['/bin', '/usr/bin/'],
                               )
-    self.assertResourceCalled('File', '/etc/snmp/snmpd.conf',
-                              content = Template('snmpd.conf.j2'),
-                              )
-    self.assertResourceCalled('Service', 'snmpd',
-                              action = ['restart'],
-                              )
     self.assertResourceCalled('Execute', '/bin/echo 0 > /selinux/enforce',
                               only_if = 'test -f /selinux/enforce',
                               )
@@ -169,6 +163,12 @@ log4j.additivity.org.apache.hadoop.mapred.JobHistory$JobHistoryLogger=true
       owner = 'mapred',
       group = 'hadoop',
     )
+    self.assertResourceCalled('File', '/etc/snmp/snmpd.conf',
+                              content = Template('snmpd.conf.j2'),
+                              )
+    self.assertResourceCalled('Execute', 'service snmpd start; chkconfig snmpd on',
+                              path = ['/usr/local/bin/:/bin/:/sbin/'],
+                              )
     self.assertNoMoreResources()
 
   def test_hook_secured(self):
@@ -195,12 +195,6 @@ log4j.additivity.org.apache.hadoop.mapred.JobHistory$JobHistoryLogger=true
                               only_if = 'test -e /usr/jdk64/jdk1.7.0_45/jre/lib/security && test -f /tmp/HDP-artifacts//UnlimitedJCEPolicyJDK7.zip',
                               cwd = '/usr/jdk64/jdk1.7.0_45/jre/lib/security',
                               )
-    self.assertResourceCalled('File', '/etc/snmp/snmpd.conf',
-                              content = Template('snmpd.conf.j2'),
-                              )
-    self.assertResourceCalled('Service', 'snmpd',
-                              action = ['restart'],
-                              )
     self.assertResourceCalled('Execute', '/bin/echo 0 > /selinux/enforce',
                               only_if = 'test -f /selinux/enforce',
                               )
@@ -315,5 +309,11 @@ log4j.additivity.org.apache.hadoop.mapred.JobHistory$JobHistoryLogger=true
                               owner = 'mapred',
                               group = 'hadoop',
                               )
+    self.assertResourceCalled('File', '/etc/snmp/snmpd.conf',
+                              content = Template('snmpd.conf.j2'),
+                              )
+    self.assertResourceCalled('Execute', 'service snmpd start; chkconfig snmpd on',
+                              path = ['/usr/local/bin/:/bin/:/sbin/'],
+                             )
     self.assertNoMoreResources()
 

ambari-server/src/test/python/stacks/2.0.6/NAGIOS/test_nagios_server.py

@@ -71,10 +71,6 @@ class TestNagiosServer(RMFTestCase):
                               content=Template("nagios.conf.j2"),
                               mode=0644
     )
-    self.assertResourceCalled('Execute',
-                              'service snmpd start; chkconfig snmpd on',
-                              path=['/usr/local/bin/:/bin/:/sbin/']
-    )
     self.assertResourceCalled('Directory', '/etc/nagios',
                               owner='nagios',
                               group='nagios',

ambari-server/src/test/python/stacks/2.0.6/hooks/before-START/test_before_start.py

@@ -42,12 +42,6 @@ class TestHookBeforeStart(RMFTestCase):
                               ignore_failures = True,
                               path = ['/bin', '/usr/bin/'],
                               )
-    self.assertResourceCalled('File', '/etc/snmp/snmpd.conf',
-                              content = Template('snmpd.conf.j2'),
-                              )
-    self.assertResourceCalled('Service', 'snmpd',
-                              action = ['restart'],
-                              )
     self.assertResourceCalled('Execute', '/bin/echo 0 > /selinux/enforce',
                               only_if = 'test -f /selinux/enforce',
                               )
@@ -163,6 +157,12 @@ class TestHookBeforeStart(RMFTestCase):
       owner = 'mapred',
       group = 'hadoop',
     )
+    self.assertResourceCalled('File', '/etc/snmp/snmpd.conf',
+                              content = Template('snmpd.conf.j2'),
+                              )
+    self.assertResourceCalled('Execute', 'service snmpd start; chkconfig snmpd on',
+                            path = ['/usr/local/bin/:/bin/:/sbin/'],
+                            )
     self.assertNoMoreResources()
 
   def test_hook_secured(self):
@@ -189,12 +189,6 @@ class TestHookBeforeStart(RMFTestCase):
                               only_if = 'test -e /usr/jdk64/jdk1.7.0_45/jre/lib/security && test -f /tmp/HDP-artifacts//UnlimitedJCEPolicyJDK7.zip',
                               cwd = '/usr/jdk64/jdk1.7.0_45/jre/lib/security',
                               )
-    self.assertResourceCalled('File', '/etc/snmp/snmpd.conf',
-                              content = Template('snmpd.conf.j2'),
-                              )
-    self.assertResourceCalled('Service', 'snmpd',
-                              action = ['restart'],
-                              )
     self.assertResourceCalled('Execute', '/bin/echo 0 > /selinux/enforce',
                               only_if = 'test -f /selinux/enforce',
                               )
@@ -317,4 +311,10 @@ class TestHookBeforeStart(RMFTestCase):
                               owner = 'mapred',
                               group = 'hadoop',
                               )
+    self.assertResourceCalled('File', '/etc/snmp/snmpd.conf',
+                              content = Template('snmpd.conf.j2'),
+                              )
+    self.assertResourceCalled('Execute', 'service snmpd start; chkconfig snmpd on',
+                            path = ['/usr/local/bin/:/bin/:/sbin/'],
+                            )
     self.assertNoMoreResources()