ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alejan...@apache.org
Subject git commit: AMBARI-8034. Slider configuration for slider-client could be empty and hence not set in the supplied configuration to install commands (alejandro)
Date Thu, 30 Oct 2014 02:32:08 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 350f6ff0c -> 44b304b45


AMBARI-8034. Slider configuration for slider-client could be empty and hence not set in the
supplied configuration to install commands (alejandro)


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

Branch: refs/heads/trunk
Commit: 44b304b456a1886d3acd8ebf05997e97a085d1a9
Parents: 350f6ff
Author: Alejandro Fernandez <afernandez@hortonworks.com>
Authored: Wed Oct 29 19:25:47 2014 -0700
Committer: Alejandro Fernandez <afernandez@hortonworks.com>
Committed: Wed Oct 29 19:30:08 2014 -0700

----------------------------------------------------------------------
 .../stacks/HDP/2.2/services/SLIDER/package/scripts/slider.py     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/44b304b4/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/package/scripts/slider.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/package/scripts/slider.py
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/package/scripts/slider.py
index 9944865..48c534e 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/package/scripts/slider.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/package/scripts/slider.py
@@ -30,9 +30,11 @@ def slider():
             recursive=True
   )
 
+  slider_client_config = params.config['configurations']['slider-client'] if 'configurations'
in params.config and 'slider-client' in params.config['configurations'] else {}
+
   XmlConfig("slider-client.xml",
             conf_dir=params.slider_conf_dir,
-            configurations=params.config['configurations']['slider-client']
+            configurations=slider_client_config
   )
 
   File(format("{slider_conf_dir}/slider-env.sh"),


Mime
View raw message