Repository: ambari
Updated Branches:
  refs/heads/branch-1.7.0 e64f0c013 -> b8a1f3a6e


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/b8a1f3a6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b8a1f3a6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b8a1f3a6

Branch: refs/heads/branch-1.7.0
Commit: b8a1f3a6e1e9ad50e438497dc72c724200497d16
Parents: e64f0c0
Author: Alejandro Fernandez <[email protected]>
Authored: Wed Oct 29 19:31:10 2014 -0700
Committer: Alejandro Fernandez <[email protected]>
Committed: Wed Oct 29 19:31:10 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/b8a1f3a6/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"),

Reply via email to