You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2015/12/23 16:07:11 UTC
[32/51] [abbrv] ambari git commit: AMBARI-14460 Enable kerberos
security after express upgrade has failed at Start service step because of
slider client xml permission. (dsen)
AMBARI-14460 Enable kerberos security after express upgrade has failed at Start service step because of slider client xml permission. (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/676f3176
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/676f3176
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/676f3176
Branch: refs/heads/branch-dev-patch-upgrade
Commit: 676f3176524dd9d07804a16a0bafd43911cdc8f6
Parents: 2d8721a
Author: Dmytro Sen <ds...@apache.org>
Authored: Tue Dec 22 14:46:31 2015 +0200
Committer: Dmytro Sen <ds...@apache.org>
Committed: Tue Dec 22 14:46:31 2015 +0200
----------------------------------------------------------------------
.../common-services/SLIDER/0.60.0.2.2/package/scripts/slider.py | 3 ++-
.../src/test/python/stacks/2.2/SLIDER/test_slider_client.py | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/676f3176/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/slider.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/slider.py b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/slider.py
index 3799c5b..b487259 100644
--- a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/slider.py
+++ b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/slider.py
@@ -54,7 +54,8 @@ def slider():
XmlConfig("slider-client.xml",
conf_dir=params.slider_conf_dir,
- configurations=slider_client_config
+ configurations=slider_client_config,
+ mode=0644
)
File(format("{slider_conf_dir}/slider-env.sh"),
http://git-wip-us.apache.org/repos/asf/ambari/blob/676f3176/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 01787a1..2cf6edb 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
@@ -43,7 +43,8 @@ class TestSliderClient(RMFTestCase):
self.assertResourceCalled('XmlConfig',
'slider-client.xml',
conf_dir='/usr/hdp/current/slider-client/conf',
- configurations=self.getConfig()['configurations']['slider-client']
+ configurations=self.getConfig()['configurations']['slider-client'],
+ mode=0644
)
self.assertResourceCalled('File', '/usr/hdp/current/slider-client/conf/slider-env.sh',