Repository: ambari Updated Branches: refs/heads/branch-2.4 1ac59c3ff -> 10e6c474c
AMBARI-20843. Client configs downloaded via Ambari are empty with non-root ambari-server. (Andrew Onischuk via stoader) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/10e6c474 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/10e6c474 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/10e6c474 Branch: refs/heads/branch-2.4 Commit: 10e6c474c1526c05a0f213bc688e826d7bdca551 Parents: 1ac59c3 Author: Andrew Onischuk <aonis...@hortonworks.com> Authored: Fri Apr 28 11:15:02 2017 +0200 Committer: Toader, Sebastian <stoa...@hortonworks.com> Committed: Fri Apr 28 11:15:02 2017 +0200 ---------------------------------------------------------------------- .../python/resource_management/libraries/script/script.py | 6 +++--- .../src/test/python/stacks/2.0.6/HDFS/test_hdfs_client.py | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/10e6c474/ambari-common/src/main/python/resource_management/libraries/script/script.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/libraries/script/script.py b/ambari-common/src/main/python/resource_management/libraries/script/script.py index 43e5fa2..882fad9 100644 --- a/ambari-common/src/main/python/resource_management/libraries/script/script.py +++ b/ambari-common/src/main/python/resource_management/libraries/script/script.py @@ -823,19 +823,19 @@ class Script(object): for filename, dict in file_dict.iteritems(): XmlConfig(filename, conf_dir=conf_tmp_dir, - mode=0600, + mode=0644, **self.generate_configs_get_xml_file_content(filename, dict) ) for file_dict in env_configs_list: for filename,dicts in file_dict.iteritems(): File(os.path.join(conf_tmp_dir, filename), - mode=0600, + mode=0644, content=InlineTemplate(self.generate_configs_get_template_file_content(filename, dicts))) for file_dict in properties_configs_list: for filename, dict in file_dict.iteritems(): PropertiesFile(os.path.join(conf_tmp_dir, filename), - mode=0600, + mode=0644, properties=self.generate_configs_get_xml_file_dict(filename, dict) ) with closing(tarfile.open(output_filename, "w:gz")) as tar: http://git-wip-us.apache.org/repos/asf/ambari/blob/10e6c474/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_hdfs_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_hdfs_client.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_hdfs_client.py index 85098fa..39b572d 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_hdfs_client.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_hdfs_client.py @@ -50,25 +50,25 @@ class Test(RMFTestCase): ) self.assertResourceCalled('XmlConfig', 'hdfs-site.xml', conf_dir = '/tmp/123', - mode=0600, + mode=0644, configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site'], configurations = self.getConfig()['configurations']['hdfs-site'], ) self.assertResourceCalled('File', '/tmp/123/hadoop-env.sh', - mode=0600, + mode=0644, content = InlineTemplate(self.getConfig()['configurations']['hadoop-env']['content']), ) self.assertResourceCalled('File', '/tmp/123/log4j.properties', - mode=0600, + mode=0644, content = InlineTemplate(self.getConfig()['configurations']['hdfs-log4j']['content']+ self.getConfig()['configurations']['yarn-log4j']['content']), ) self.assertResourceCalled('PropertiesFile', '/tmp/123/runtime.properties', - mode=0600, + mode=0644, properties = UnknownConfigurationMock(), ) self.assertResourceCalled('PropertiesFile', '/tmp/123/startup.properties', - mode=0600, + mode=0644, properties = UnknownConfigurationMock(), ) self.assertResourceCalled('Directory', '/tmp/123',
