Repository: ambari Updated Branches: refs/heads/branch-2.2 3e4c800ee -> ce7f65a44
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/ce7f65a4 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ce7f65a4 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ce7f65a4 Branch: refs/heads/branch-2.2 Commit: ce7f65a4449c78ed9b291912a09b6b284ae37216 Parents: 3e4c800 Author: Dmytro Sen <[email protected]> Authored: Tue Dec 22 14:46:31 2015 +0200 Committer: Dmytro Sen <[email protected]> Committed: Tue Dec 22 14:49:00 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/ce7f65a4/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 2f03d5b..701da23 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/ce7f65a4/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 ac2c450..8411b97 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',
