ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject [01/35] ambari git commit: Revert "AMBARI-18237. Certain configuration files cannot be modified through Ambari api. (aonishuk)"
Date Wed, 14 Sep 2016 18:32:21 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-dev-patch-upgrade e4cb41e0a -> 752e7c463


Revert "AMBARI-18237. Certain configuration files cannot be modified through Ambari api. (aonishuk)"

This reverts commit 4b141dd8842fe97d9cf8565af179ea2b68191729.


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/181de178
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/181de178
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/181de178

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 181de178b270fd111f395b951ded7ae670a7d9ce
Parents: e4cb41e
Author: Andrew Onishuk <aonishuk@hortonworks.com>
Authored: Mon Sep 12 21:10:19 2016 +0300
Committer: Andrew Onishuk <aonishuk@hortonworks.com>
Committed: Mon Sep 12 21:10:39 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, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/181de178/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 45eab2f..49a14d0 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,12 +40,11 @@ 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/181de178/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 ff52b31..ba9c8fb 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=InlineTemplate(params.hadoop_metrics2_properties_content)
+           content=Template("hadoop-metrics2.properties.j2")
       )
 
     if params.dfs_type == 'HCFS' and params.has_core_site and 'ECS_CLIENT' in params.component_list:


Mime
View raw message