AMBARI-7350. Add SLIDER service to the stacks (part - II)

ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/package/scripts/params.py

@@ -34,12 +34,12 @@ else:
   slider_conf_dir = "/usr/lib/slider/conf"
   slider_bin_dir = "/usr/lib/slider/bin"
 
+hadoop_conf_dir = "/etc/hadoop/conf"
 smokeuser = config['configurations']['cluster-env']['smokeuser']
-user_group = config['configurations']['cluster-env']['user_group']
 security_enabled = config['configurations']['cluster-env']['security_enabled']
 smokeuser_keytab = config['configurations']['cluster-env']['smokeuser_keytab']
 kinit_path_local = functions.get_kinit_path(["/usr/bin", "/usr/kerberos/bin", "/usr/sbin"])
 
 java64_home = config['hostLevelParams']['java_home']
 log4j_props = config['configurations']['slider-log4j']['content']
-slider_cmd = format("{slider_bin_dir}/slider-wrapper")
+slider_cmd = format("{slider_bin_dir}/slider")

ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/package/scripts/slider.py

@@ -34,27 +34,9 @@ def slider():
             configurations=params.config['configurations']['slider-client']
   )
 
-  XmlConfig("core-site.xml",
-            conf_dir=params.slider_conf_dir,
-            configurations=params.config['configurations']['core-site'],
-            configuration_attributes=params.config['configuration_attributes']['core-site']
-  )
-
-  XmlConfig("hdfs-site.xml",
-            conf_dir=params.slider_conf_dir,
-            configurations=params.config['configurations']['hdfs-site'],
-            configuration_attributes=params.config['configuration_attributes']['hdfs-site']
-  )
-
-  XmlConfig("yarn-site.xml",
-            conf_dir=params.slider_conf_dir,
-            configurations=params.config['configurations']['yarn-site'],
-            configuration_attributes=params.config['configuration_attributes']['yarn-site']
-  )
-
-  File(format("{slider_bin_dir}/slider-wrapper"),
+  File(format("{slider_conf_dir}/slider-env.sh"),
        mode=0755,
-       content=Template('slider-wrapper.j2')
+       content=Template('slider-env.sh.j2')
   )
 
   if (params.log4j_props != None):

ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/package/templates/slider-wrapper.j2 → ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/package/templates/slider-env.sh.j2

@@ -34,9 +34,5 @@
 # * See the License for the specific language governing permissions and
 # * limitations under the License.
 # */
-import slider
-import os, sys
-
-if __name__ == '__main__':
-  os.environ["JAVA_HOME"] = "{{java64_home}}"
-  slider.main()
+export JAVA_HOME={{java64_home}}
+export HADOOP_CONF_DIR={{hadoop_conf_dir}}

ambari-server/src/test/python/stacks/2.2/SLIDER/test_slider_client.py

@@ -38,30 +38,9 @@ class TestSliderClient(RMFTestCase):
                               configurations=self.getConfig()['configurations']['slider-client']
     )
 
-    self.assertResourceCalled('XmlConfig',
-                              'core-site.xml',
-                              conf_dir='/usr/lib/slider/conf',
-                              configurations=self.getConfig()['configurations']['core-site'],
-                              configuration_attributes=self.getConfig()['configuration_attributes']['core-site']
-    )
-
-    self.assertResourceCalled('XmlConfig',
-                              'hdfs-site.xml',
-                              conf_dir='/usr/lib/slider/conf',
-                              configurations=self.getConfig()['configurations']['hdfs-site'],
-                              configuration_attributes=self.getConfig()['configuration_attributes']['hdfs-site']
-    )
-
-    self.assertResourceCalled('XmlConfig',
-                              'yarn-site.xml',
-                              conf_dir='/usr/lib/slider/conf',
-                              configurations=self.getConfig()['configurations']['yarn-site'],
-                              configuration_attributes=self.getConfig()['configuration_attributes']['yarn-site']
-    )
-
     self.assertResourceCalled('File',
-                              '/usr/lib/slider/bin/slider-wrapper',
-                              content=Template('slider-wrapper.j2'),
+                              '/usr/lib/slider/conf/slider-env.sh',
+                              content=Template('slider-env.sh.j2'),
                               mode=0755
     )
 
@@ -83,7 +62,7 @@ class TestSliderClient(RMFTestCase):
     )
 
     self.assertResourceCalled('Execute',
-                              '/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari-qa; /usr/lib/slider/bin/slider-wrapper list',
+                              '/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari-qa; /usr/lib/slider/bin/slider list',
                               logoutput=True,
                               tries=3,
                               user='ambari-qa',
@@ -99,7 +78,7 @@ class TestSliderClient(RMFTestCase):
                        config_file="default.json"
     )
 
-    self.assertResourceCalled('Execute', ' /usr/lib/slider/bin/slider-wrapper list',
+    self.assertResourceCalled('Execute', ' /usr/lib/slider/bin/slider list',
                               logoutput=True,
                               tries=3,
                               user='ambari-qa',