ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject [01/50] [abbrv] git commit: AMBARI-7567. Modify Slider service definition to handle versioned rpms and new path naming scheme
Date Wed, 01 Oct 2014 15:26:59 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-alerts-dev 054745d06 -> 6f9398f0f


AMBARI-7567. Modify Slider service definition to handle versioned rpms and new path naming
scheme


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1acb7395
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1acb7395
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1acb7395

Branch: refs/heads/branch-alerts-dev
Commit: 1acb739586904135591278be0a6fd69f0e8c2dc3
Parents: 753fe29
Author: Sumit Mohanty <smohanty@hortonworks.com>
Authored: Tue Sep 30 14:08:43 2014 -0700
Committer: Sumit Mohanty <smohanty@hortonworks.com>
Committed: Tue Sep 30 14:08:43 2014 -0700

----------------------------------------------------------------------
 .../resources/stacks/HDP/2.2/services/SLIDER/metainfo.xml   | 2 +-
 .../HDP/2.2/services/SLIDER/package/scripts/params.py       | 9 +++------
 .../src/test/python/stacks/2.2/SLIDER/test_slider_client.py | 8 ++++----
 3 files changed, 8 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/1acb7395/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/metainfo.xml
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/metainfo.xml
index 2119b24..153c79b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/metainfo.xml
@@ -57,7 +57,7 @@
           <osFamily>any</osFamily>
           <packages>
             <package>
-              <name>slider</name>
+              <name>slider_2_2_0_0_*</name>
             </package>
           </packages>
         </osSpecific>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1acb7395/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/package/scripts/params.py
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/package/scripts/params.py
index c791083..7c1faa7 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/package/scripts/params.py
@@ -28,14 +28,11 @@ rpm_version = default("/configurations/cluster-env/rpm_version", None)
 
 #hadoop params
 if rpm_version:
-#  slider_conf_dir = '/usr/lib/current/slider/conf'
-#  slider_bin_dir = '/usr/lib/current/slider/bin'
-  slider_conf_dir = "/usr/lib/slider/conf"
-  slider_bin_dir = "/usr/lib/slider/bin"
+  slider_bin_dir = '/usr/hdp/current/slider/bin'
 else:
-  slider_conf_dir = "/usr/lib/slider/conf"
   slider_bin_dir = "/usr/lib/slider/bin"
 
+slider_conf_dir = "/etc/slider/conf"
 hadoop_conf_dir = "/etc/hadoop/conf"
 smokeuser = config['configurations']['cluster-env']['smokeuser']
 security_enabled = config['configurations']['cluster-env']['security_enabled']
@@ -44,4 +41,4 @@ kinit_path_local = functions.get_kinit_path(["/usr/bin", "/usr/kerberos/bin",
"/
 
 java64_home = config['hostLevelParams']['java_home']
 log4j_props = config['configurations']['slider-log4j']['content']
-slider_cmd = format("{slider_bin_dir}/slider")
\ No newline at end of file
+slider_cmd = format("{slider_bin_dir}/slider")

http://git-wip-us.apache.org/repos/asf/ambari/blob/1acb7395/ambari-server/src/test/python/stacks/2.2/SLIDER/test_slider_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.2/SLIDER/test_slider_client.py b/ambari-server/src/test/python/stacks/2.2/SLIDER/test_slider_client.py
index 00d9057..c89e73c 100644
--- a/ambari-server/src/test/python/stacks/2.2/SLIDER/test_slider_client.py
+++ b/ambari-server/src/test/python/stacks/2.2/SLIDER/test_slider_client.py
@@ -30,24 +30,24 @@ class TestSliderClient(RMFTestCase):
     )
 
     self.assertResourceCalled('Directory',
-                              '/usr/lib/slider/conf',
+                              '/etc/slider/conf',
                               recursive=True
     )
 
     self.assertResourceCalled('XmlConfig',
                               'slider-client.xml',
-                              conf_dir='/usr/lib/slider/conf',
+                              conf_dir='/etc/slider/conf',
                               configurations=self.getConfig()['configurations']['slider-client']
     )
 
     self.assertResourceCalled('File',
-                              '/usr/lib/slider/conf/slider-env.sh',
+                              '/etc/slider/conf/slider-env.sh',
                               content=Template('slider-env.sh.j2'),
                               mode=0755
     )
 
     self.assertResourceCalled('File',
-                              '/usr/lib/slider/conf/log4j.properties',
+                              '/etc/slider/conf/log4j.properties',
                               mode=0644,
                               content='log4jproperties\nline2'
     )


Mime
View raw message