You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2016/09/12 09:35:19 UTC
[2/2] ambari git commit: AMBARI-18237. Certain configuration files
cannot be modified through Ambari api. (aonishuk)
AMBARI-18237. Certain configuration files cannot be modified through Ambari api. (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/80a6b014
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/80a6b014
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/80a6b014
Branch: refs/heads/branch-2.5
Commit: 80a6b01415cba7f011be1551ea24bef7cbfe393c
Parents: 26e5fe0
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Mon Sep 12 12:35:10 2016 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Mon Sep 12 12:35:10 2016 +0300
----------------------------------------------------------------------
.../stacks/HDP/2.0.6/hooks/before-START/scripts/params.py | 3 ++-
.../HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/80a6b014/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
index fc2c61f..63d4fc7 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
@@ -40,11 +40,12 @@ stack_version_formatted = format_stack_version(stack_version_unformatted)
dfs_type = default("/commandParams/dfs_type", "")
hadoop_conf_dir = "/etc/hadoop/conf"
-
component_list = default("/localComponents", [])
hdfs_tmp_dir = config['configurations']['hadoop-env']['hdfs_tmp_dir']
+hadoop_metrics2_properties_content = config['configurations']['hadoop-metrics2.properties']['content']
+
# hadoop default params
mapreduce_libs_path = "/usr/lib/hadoop-mapreduce/*"
http://git-wip-us.apache.org/repos/asf/ambari/blob/80a6b014/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py
index ba9c8fb..ff52b31 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py
@@ -101,7 +101,7 @@ def setup_hadoop():
File(os.path.join(params.hadoop_conf_dir, "hadoop-metrics2.properties"),
owner=params.hdfs_user,
group=params.user_group,
- content=Template("hadoop-metrics2.properties.j2")
+ content=InlineTemplate(params.hadoop_metrics2_properties_content)
)
if params.dfs_type == 'HCFS' and params.has_core_site and 'ECS_CLIENT' in params.component_list: