[2/2] ambari git commit: AMBARI-12662. Ambari is overwriting the content of the topology script, even custom (aonishuk)

[ao...@apache.org]

AMBARI-12662. Ambari is overwriting the content of the topology script, even custom (aonishuk)


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

Branch: refs/heads/branch-2.1
Commit: a54adf7a3c1471437e8cb2c291b0b7a50ec3c70a
Parents: 0080dc1
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Thu Aug 6 17:13:36 2015 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Thu Aug 6 17:13:36 2015 +0300

----------------------------------------------------------------------
 .../stacks/HDP/2.0.6/hooks/before-START/scripts/params.py         | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/a54adf7a/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 1b42d44..0fc87a5 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
@@ -42,7 +42,6 @@ hadoop_lib_home = hdp_select.get_hadoop_dir("lib")
 hadoop_bin = hdp_select.get_hadoop_dir("sbin")
 hadoop_home = '/usr'
 create_lib_snappy_symlinks = True
-default_topology_script_file_path = "/etc/hadoop/conf/topology_script.py"
 
 # HDP 2.2+ params
 if Script.is_hdp_stack_greater_or_equal("2.2"):
@@ -194,7 +193,7 @@ all_ipv4_ips = default("/clusterHostInfo/all_ipv4_ips", [])
 slave_hosts = default("/clusterHostInfo/slave_hosts", [])
 
 #topology files
-net_topology_script_file_path = default("/configurations/core-site/net.topology.script.file.name",default_topology_script_file_path)
+net_topology_script_file_path = "/etc/hadoop/conf/topology_script.py"
 net_topology_script_dir = os.path.dirname(net_topology_script_file_path)
 net_topology_mapping_data_file_name = 'topology_mappings.data'
 net_topology_mapping_data_file_path = os.path.join(net_topology_script_dir, net_topology_mapping_data_file_name)