AMBARI-7115. Stack Service Pluggability: Adding service to a stack requires editing hooks folder (aonishuk)

ambari-server/src/test/python/stacks/1.3.2/configs/default.json

@@ -17,7 +17,9 @@
         "jdk_name": "jdk-7u45-linux-x64.tar.gz", 
         "ambari_db_rca_username": "mapred", 
         "java_home": "/usr/jdk64/jdk1.7.0_45", 
-        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar"
+        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar",
+        "group_list": "[\"hadoop\",\"nobody\",\"users\",\"nagios\"]",
+        "user_list": "[\"hive\",\"oozie\",\"nobody\",\"nagios\",\"ambari-qa\",\"flume\",\"hdfs\",\"storm\",\"mapred\",\"hbase\",\"tez\",\"zookeeper\",\"falcon\",\"sqoop\",\"yarn\",\"hcat\"]"
     }, 
     "commandType": "EXECUTION_COMMAND", 
     "roleParams": {}, 

ambari-server/src/test/python/stacks/1.3.2/hooks/before-INSTALL/test_before_install.py

@@ -50,93 +50,108 @@ class TestHookBeforeInstall(RMFTestCase):
     self.assertResourceCalled('Group', 'hadoop',
         ignore_failures = False,
     )
-    self.assertResourceCalled('Group', 'users',
+    self.assertResourceCalled('Group', 'nobody',
         ignore_failures = False,
     )
     self.assertResourceCalled('Group', 'users',
         ignore_failures = False,
     )
-    self.assertResourceCalled('User', 'ambari-qa',
-        gid = 'hadoop',
+    self.assertResourceCalled('Group', 'nagios',
         ignore_failures = False,
-        groups = [u'users'],
-    )
-    self.assertResourceCalled('File', '/tmp/changeUid.sh',
-        content = StaticFile('changeToSecureUid.sh'),
-        mode = 0555,
     )
-    self.assertResourceCalled('Execute', '/tmp/changeUid.sh ambari-qa /tmp/hadoop-ambari-qa,/tmp/hsperfdata_ambari-qa,/home/ambari-qa,/tmp/ambari-qa,/tmp/sqoop-ambari-qa 2>/dev/null',
-        not_if = 'test $(id -u ambari-qa) -gt 1000',
-    )
-    self.assertResourceCalled('User', 'hbase',
+    self.assertResourceCalled('User', 'hive',
         gid = 'hadoop',
         ignore_failures = False,
         groups = [u'hadoop'],
     )
-    self.assertResourceCalled('File', '/tmp/changeUid.sh',
-        content = StaticFile('changeToSecureUid.sh'),
-        mode = 0555,
-    )
-    self.assertResourceCalled('Execute', '/tmp/changeUid.sh hbase /home/hbase,/tmp/hbase,/usr/bin/hbase,/var/log/hbase,/hadoop/hbase 2>/dev/null',
-        not_if = 'test $(id -u hbase) -gt 1000',
+    self.assertResourceCalled('User', 'oozie',
+        gid = 'hadoop',
+        ignore_failures = False,
+        groups = [u'hadoop'],
     )
-    self.assertResourceCalled('Group', 'nagios',
+    self.assertResourceCalled('User', 'nobody',
+        gid = 'hadoop',
         ignore_failures = False,
+        groups = [u'nobody'],
     )
     self.assertResourceCalled('User', 'nagios',
         gid = 'nagios',
         ignore_failures = False,
+        groups = [u'hadoop'],
     )
-    self.assertResourceCalled('User', 'oozie',
+    self.assertResourceCalled('User', 'ambari-qa',
         gid = 'hadoop',
         ignore_failures = False,
+        groups = [u'users'],
     )
-    self.assertResourceCalled('User', 'hcat',
+    self.assertResourceCalled('User', 'flume',
         gid = 'hadoop',
         ignore_failures = False,
+        groups = [u'hadoop'],
     )
-    self.assertResourceCalled('User', 'hcat',
+    self.assertResourceCalled('User', 'hdfs',
         gid = 'hadoop',
         ignore_failures = False,
+        groups = [u'hadoop'],
     )
-    self.assertResourceCalled('User', 'hive',
+    self.assertResourceCalled('User', 'storm',
         gid = 'hadoop',
         ignore_failures = False,
+        groups = [u'hadoop'],
     )
-    self.assertResourceCalled('Group', 'nobody',
+    self.assertResourceCalled('User', 'mapred',
+        gid = 'hadoop',
         ignore_failures = False,
+        groups = [u'hadoop'],
     )
-    self.assertResourceCalled('Group', 'nobody',
+    self.assertResourceCalled('User', 'hbase',
+        gid = 'hadoop',
         ignore_failures = False,
+        groups = [u'hadoop'],
     )
-    self.assertResourceCalled('User', 'nobody',
+    self.assertResourceCalled('User', 'tez',
         gid = 'hadoop',
         ignore_failures = False,
-        groups = [u'nobody'],
+        groups = [u'hadoop'],
     )
-    self.assertResourceCalled('User', 'nobody',
+    self.assertResourceCalled('User', 'zookeeper',
         gid = 'hadoop',
         ignore_failures = False,
-        groups = [u'nobody'],
+        groups = [u'hadoop'],
     )
-    self.assertResourceCalled('User', 'hdfs',
+    self.assertResourceCalled('User', 'falcon',
         gid = 'hadoop',
         ignore_failures = False,
         groups = [u'hadoop'],
     )
-    self.assertResourceCalled('User', 'mapred',
+    self.assertResourceCalled('User', 'sqoop',
         gid = 'hadoop',
         ignore_failures = False,
         groups = [u'hadoop'],
     )
-    self.assertResourceCalled('User', 'zookeeper',
+    self.assertResourceCalled('User', 'yarn',
         gid = 'hadoop',
         ignore_failures = False,
+        groups = [u'hadoop'],
     )
-    self.assertResourceCalled('User', 'sqoop',
+    self.assertResourceCalled('User', 'hcat',
         gid = 'hadoop',
         ignore_failures = False,
-        groups = ['hadoop'],
+        groups = [u'hadoop'],
+    )
+    self.assertResourceCalled('File', '/tmp/changeUid.sh',
+        content = StaticFile('changeToSecureUid.sh'),
+        mode = 0555,
+    )
+    self.assertResourceCalled('Execute', '/tmp/changeUid.sh ambari-qa /tmp/hadoop-ambari-qa,/tmp/hsperfdata_ambari-qa,/home/ambari-qa,/tmp/ambari-qa,/tmp/sqoop-ambari-qa 2>/dev/null',
+        not_if = 'test $(id -u ambari-qa) -gt 1000',
+    )
+    self.assertResourceCalled('File', '/tmp/changeUid.sh',
+        content = StaticFile('changeToSecureUid.sh'),
+        mode = 0555,
+    )
+    self.assertResourceCalled('Execute', '/tmp/changeUid.sh hbase /home/hbase,/tmp/hbase,/usr/bin/hbase,/var/log/hbase,/hadoop/hbase 2>/dev/null',
+        not_if = 'test $(id -u hbase) -gt 1000',
     )
     self.assertResourceCalled('Package', 'unzip',)
     self.assertNoMoreResources()

ambari-server/src/test/python/stacks/2.0.6/configs/default.json

@@ -14,7 +14,9 @@
         "jdk_name": "jdk-7u45-linux-x64.tar.gz", 
         "ambari_db_rca_username": "mapred", 
         "java_home": "/usr/jdk64/jdk1.7.0_45",
-        "db_name": "ambari"
+        "db_name": "ambari",
+        "group_list": "[\"hadoop\",\"nobody\",\"users\",\"nagios\"]",
+        "user_list": "[\"hive\",\"oozie\",\"nobody\",\"nagios\",\"ambari-qa\",\"flume\",\"hdfs\",\"storm\",\"mapred\",\"hbase\",\"tez\",\"zookeeper\",\"falcon\",\"sqoop\",\"yarn\",\"hcat\"]"
     }, 
     "commandType": "EXECUTION_COMMAND", 
     "roleParams": {}, 
@@ -30,7 +32,6 @@
         "xml_configs_list":[{"hdfs-site.xml":"hdfs-site"}],
         "env_configs_list":[{"hadoop-env.sh":"hadoop-env"},{"log4j.properties":"hdfs-log4j,yarn-log4j"}],
         "output_file":"HDFS_CLIENT-configs.tar.gz"
-
     },
     "taskId": 152, 
     "public_hostname": "c6401.ambari.apache.org", 

ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py

@@ -52,111 +52,107 @@ class TestHookBeforeInstall(RMFTestCase):
     self.assertResourceCalled('Group', 'hadoop',
         ignore_failures = False,
     )
-    self.assertResourceCalled('Group', 'users',
+    self.assertResourceCalled('Group', 'nobody',
         ignore_failures = False,
     )
     self.assertResourceCalled('Group', 'users',
         ignore_failures = False,
     )
-    self.assertResourceCalled('User', 'ambari-qa',
-        gid = 'hadoop',
+    self.assertResourceCalled('Group', 'nagios',
         ignore_failures = False,
-        groups = [u'users'],
-    )
-    self.assertResourceCalled('File', '/tmp/changeUid.sh',
-        content = StaticFile('changeToSecureUid.sh'),
-        mode = 0555,
-    )
-    self.assertResourceCalled('Execute', '/tmp/changeUid.sh ambari-qa /tmp/hadoop-ambari-qa,/tmp/hsperfdata_ambari-qa,/home/ambari-qa,/tmp/ambari-qa,/tmp/sqoop-ambari-qa 2>/dev/null',
-        not_if = 'test $(id -u ambari-qa) -gt 1000',
     )
-    self.assertResourceCalled('User', 'hbase',
+    self.assertResourceCalled('User', 'hive',
         gid = 'hadoop',
         ignore_failures = False,
         groups = [u'hadoop'],
     )
-    self.assertResourceCalled('File', '/tmp/changeUid.sh',
-        content = StaticFile('changeToSecureUid.sh'),
-        mode = 0555,
-    )
-    self.assertResourceCalled('Execute', '/tmp/changeUid.sh hbase /home/hbase,/tmp/hbase,/usr/bin/hbase,/var/log/hbase,/hadoop/hbase 2>/dev/null',
-        not_if = 'test $(id -u hbase) -gt 1000',
-    )
-    self.assertResourceCalled('Group', 'nagios',
-        ignore_failures = False,
-    )
-    self.assertResourceCalled('User', 'nagios',
-        gid = 'nagios',
-        ignore_failures = False,
-    )
     self.assertResourceCalled('User', 'oozie',
         gid = 'hadoop',
         ignore_failures = False,
+        groups = [u'hadoop'],
     )
-    self.assertResourceCalled('User', 'hcat',
+    self.assertResourceCalled('User', 'nobody',
         gid = 'hadoop',
         ignore_failures = False,
+        groups = [u'nobody'],
     )
-    self.assertResourceCalled('User', 'hcat',
-        gid = 'hadoop',
+    self.assertResourceCalled('User', 'nagios',
+        gid = 'nagios',
         ignore_failures = False,
+        groups = [u'hadoop'],
     )
-    self.assertResourceCalled('User', 'hive',
+    self.assertResourceCalled('User', 'ambari-qa',
         gid = 'hadoop',
         ignore_failures = False,
+        groups = [u'users'],
     )
-    self.assertResourceCalled('User', 'yarn',
+    self.assertResourceCalled('User', 'flume',
         gid = 'hadoop',
         ignore_failures = False,
+        groups = [u'hadoop'],
     )
-    self.assertResourceCalled('Group', 'nobody',
-        ignore_failures = False,
-    )
-    self.assertResourceCalled('Group', 'nobody',
+    self.assertResourceCalled('User', 'hdfs',
+        gid = 'hadoop',
         ignore_failures = False,
+        groups = [u'hadoop'],
     )
-    self.assertResourceCalled('User', 'nobody',
+    self.assertResourceCalled('User', 'storm',
         gid = 'hadoop',
         ignore_failures = False,
-        groups = ['nobody'],
+        groups = [u'hadoop'],
     )
-    self.assertResourceCalled('User', 'nobody',
+    self.assertResourceCalled('User', 'mapred',
         gid = 'hadoop',
         ignore_failures = False,
-        groups = ['nobody'],
+        groups = [u'hadoop'],
     )
-    self.assertResourceCalled('User', 'hdfs',
+    self.assertResourceCalled('User', 'hbase',
         gid = 'hadoop',
         ignore_failures = False,
-        groups = ['hadoop'],
+        groups = [u'hadoop'],
     )
-    self.assertResourceCalled('User', 'mapred',
+    self.assertResourceCalled('User', 'tez',
         gid = 'hadoop',
         ignore_failures = False,
-        groups = ['hadoop'],
+        groups = [u'users'],
     )
     self.assertResourceCalled('User', 'zookeeper',
         gid = 'hadoop',
         ignore_failures = False,
+        groups = [u'hadoop'],
     )
-    self.assertResourceCalled('User', 'storm',
+    self.assertResourceCalled('User', 'falcon',
         gid = 'hadoop',
         ignore_failures = False,
-        groups = ['hadoop'],
+        groups = [u'hadoop'],
     )
-    self.assertResourceCalled('User', 'falcon',
+    self.assertResourceCalled('User', 'sqoop',
         gid = 'hadoop',
         ignore_failures = False,
-        groups = ['hadoop'],
+        groups = [u'hadoop'],
     )
-    self.assertResourceCalled('User', 'tez',
+    self.assertResourceCalled('User', 'yarn',
         gid = 'hadoop',
         ignore_failures = False,
-        groups = ['users'],
+        groups = [u'hadoop'],
     )
-    self.assertResourceCalled('User', 'sqoop',
+    self.assertResourceCalled('User', 'hcat',
         gid = 'hadoop',
         ignore_failures = False,
-        groups = ['hadoop'],
+        groups = [u'hadoop'],
+    )
+    self.assertResourceCalled('File', '/tmp/changeUid.sh',
+        content = StaticFile('changeToSecureUid.sh'),
+        mode = 0555,
+    )
+    self.assertResourceCalled('Execute', '/tmp/changeUid.sh ambari-qa /tmp/hadoop-ambari-qa,/tmp/hsperfdata_ambari-qa,/home/ambari-qa,/tmp/ambari-qa,/tmp/sqoop-ambari-qa 2>/dev/null',
+        not_if = 'test $(id -u ambari-qa) -gt 1000',
+    )
+    self.assertResourceCalled('File', '/tmp/changeUid.sh',
+        content = StaticFile('changeToSecureUid.sh'),
+        mode = 0555,
+    )
+    self.assertResourceCalled('Execute', '/tmp/changeUid.sh hbase /home/hbase,/tmp/hbase,/usr/bin/hbase,/var/log/hbase,/hadoop/hbase 2>/dev/null',
+        not_if = 'test $(id -u hbase) -gt 1000',
     )
     self.assertNoMoreResources()