This is an automated email from the ASF dual-hosted git repository.

oleewere pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 7c1f557  [AMBARI-23069] Wrong reference in params.py files for 
zookeeper hosts (#460)
7c1f557 is described below

commit 7c1f557827332c340ce5161083ade8654bcd6c38
Author: Olivér Szabó <oleew...@gmail.com>
AuthorDate: Sat Feb 24 00:43:33 2018 +0100

    [AMBARI-23069] Wrong reference in params.py files for zookeeper hosts (#460)
    
    * AMBARI-23069. Wrong reference in infra-solr params.py for zookeeper hosts.
    
    * AMBARI-23069. Fix other zookeeper_hosts references.
---
 .../common-services/AMBARI_INFRA_SOLR/0.1.0/package/scripts/params.py | 4 ++--
 .../common-services/FLUME/1.4.0.2.0/package/scripts/params.py         | 2 +-
 .../src/main/resources/stack-hooks/before-INSTALL/scripts/params.py   | 2 +-
 .../src/main/resources/stack-hooks/before-START/scripts/params.py     | 2 +-
 .../stacks/BIGTOP/0.8/hooks/before-INSTALL/scripts/params.py          | 2 +-
 .../resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/params.py  | 2 +-
 .../stacks/BIGTOP/0.8/services/ZOOKEEPER/package/scripts/params.py    | 2 +-
 .../resources/stacks/HDPWIN/2.1/hooks/after-INSTALL/scripts/params.py | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/package/scripts/params.py
index b2a19fd..e88caff 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/package/scripts/params.py
@@ -91,10 +91,10 @@ zookeeper_port = 
default('/configurations/zoo.cfg/clientPort', None)
 # get comma separated list of zookeeper hosts from clusterHostInfo
 index = 0
 zookeeper_quorum = ""
-for host in config['clusterHostInfo']['zookeeper_hosts']:
+for host in config['clusterHostInfo']['zookeeper_server_hosts']:
   zookeeper_quorum += host + ":" + str(zookeeper_port)
   index += 1
-  if index < len(config['clusterHostInfo']['zookeeper_hosts']):
+  if index < len(config['clusterHostInfo']['zookeeper_server_hosts']):
     zookeeper_quorum += ","
 
 if "infra-solr-env" in config['configurations']:
diff --git 
a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params.py
index d798a83..c10508c 100644
--- 
a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params.py
@@ -129,7 +129,7 @@ host_in_memory_aggregation_port = 
default("/configurations/ams-site/timeline.met
 
 # Cluster Zookeeper quorum
 zookeeper_quorum = None
-if not len(default("/clusterHostInfo/zookeeper_hosts", [])) == 0:
+if not len(default("/clusterHostInfo/zookeeper_server_hosts", [])) == 0:
   if 'zoo.cfg' in config['configurations'] and 'clientPort' in 
config['configurations']['zoo.cfg']:
     zookeeper_clientPort = config['configurations']['zoo.cfg']['clientPort']
   else:
diff --git 
a/ambari-server/src/main/resources/stack-hooks/before-INSTALL/scripts/params.py 
b/ambari-server/src/main/resources/stack-hooks/before-INSTALL/scripts/params.py
index 36deb2c..39ac281 100644
--- 
a/ambari-server/src/main/resources/stack-hooks/before-INSTALL/scripts/params.py
+++ 
b/ambari-server/src/main/resources/stack-hooks/before-INSTALL/scripts/params.py
@@ -61,7 +61,7 @@ hbase_master_hosts = 
default("/clusterHostInfo/hbase_master_hosts", [])
 hs_host = default("/clusterHostInfo/historyserver_hosts", [])
 jtnode_host = default("/clusterHostInfo/jtnode_hosts", [])
 namenode_host = default("/clusterHostInfo/namenode_hosts", [])
-zk_hosts = default("/clusterHostInfo/zookeeper_hosts", [])
+zk_hosts = default("/clusterHostInfo/zookeeper_server_hosts", [])
 ganglia_server_hosts = default("/clusterHostInfo/ganglia_server_hosts", [])
 storm_server_hosts = default("/clusterHostInfo/nimbus_hosts", [])
 falcon_host =  default('/clusterHostInfo/falcon_server_hosts', [])
diff --git 
a/ambari-server/src/main/resources/stack-hooks/before-START/scripts/params.py 
b/ambari-server/src/main/resources/stack-hooks/before-START/scripts/params.py
index 3dca93d..089b5f3 100644
--- 
a/ambari-server/src/main/resources/stack-hooks/before-START/scripts/params.py
+++ 
b/ambari-server/src/main/resources/stack-hooks/before-START/scripts/params.py
@@ -112,7 +112,7 @@ hbase_master_hosts = 
default("/clusterHostInfo/hbase_master_hosts", [])
 hs_host = default("/clusterHostInfo/historyserver_hosts", [])
 jtnode_host = default("/clusterHostInfo/jtnode_hosts", [])
 namenode_host = default("/clusterHostInfo/namenode_hosts", [])
-zk_hosts = default("/clusterHostInfo/zookeeper_hosts", [])
+zk_hosts = default("/clusterHostInfo/zookeeper_server_hosts", [])
 ganglia_server_hosts = default("/clusterHostInfo/ganglia_server_hosts", [])
 cluster_name = config["clusterName"]
 set_instanceId = "false"
diff --git 
a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-INSTALL/scripts/params.py
 
b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-INSTALL/scripts/params.py
index 8076fa2..1045a1e 100644
--- 
a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-INSTALL/scripts/params.py
+++ 
b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-INSTALL/scripts/params.py
@@ -56,7 +56,7 @@ hbase_master_hosts = 
default("/clusterHostInfo/hbase_master_hosts", [])
 hs_host = default("/clusterHostInfo/hs_host", [])
 jtnode_host = default("/clusterHostInfo/jtnode_host", [])
 namenode_host = default("/clusterHostInfo/namenode_host", [])
-zk_hosts = default("/clusterHostInfo/zookeeper_hosts", [])
+zk_hosts = default("/clusterHostInfo/zookeeper_server_hosts", [])
 ganglia_server_hosts = default("/clusterHostInfo/ganglia_server_host", [])
 storm_server_hosts = default("/clusterHostInfo/nimbus_hosts", [])
 falcon_host =  default('/clusterHostInfo/falcon_server_hosts', [])
diff --git 
a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/params.py
 
b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/params.py
index 7f9d196..4e68c46 100644
--- 
a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/params.py
+++ 
b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/params.py
@@ -63,7 +63,7 @@ hbase_master_hosts = 
default("/clusterHostInfo/hbase_master_hosts", [])
 hs_host = default("/clusterHostInfo/hs_host", [])
 jtnode_host = default("/clusterHostInfo/jtnode_host", [])
 namenode_host = default("/clusterHostInfo/namenode_host", [])
-zk_hosts = default("/clusterHostInfo/zookeeper_hosts", [])
+zk_hosts = default("/clusterHostInfo/zookeeper_server_hosts", [])
 ganglia_server_hosts = default("/clusterHostInfo/ganglia_server_host", [])
 
 has_namenode = not len(namenode_host) == 0
diff --git 
a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/package/scripts/params.py
 
b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/package/scripts/params.py
index 89a0b0e..09f85ef 100644
--- 
a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/package/scripts/params.py
@@ -67,7 +67,7 @@ zk_principal = 
zk_principal_name.replace('_HOST',hostname.lower())
 
 java64_home = config['ambariLevelParams']['java_home']
 
-zookeeper_hosts = config['clusterHostInfo']['zookeeper_hosts']
+zookeeper_hosts = config['clusterHostInfo']['zookeeper_server_hosts']
 zookeeper_hosts.sort()
 
 zk_keytab_path = 
config['configurations']['zookeeper-env']['zookeeper_keytab_path']
diff --git 
a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/hooks/after-INSTALL/scripts/params.py
 
b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/hooks/after-INSTALL/scripts/params.py
index d541a15..0986d3e 100644
--- 
a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/hooks/after-INSTALL/scripts/params.py
+++ 
b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/hooks/after-INSTALL/scripts/params.py
@@ -90,7 +90,7 @@ hive_server_host = 
default_string("/clusterHostInfo/hive_server_host", [], delim
 oozie_server_host = default_string("/clusterHostInfo/oozie_server", [], 
delimiter)
 webhcat_host = default_string("/clusterHostInfo/webhcat_server_host", [], 
delimiter)
 slave_hosts = default_string("/clusterHostInfo/slave_hosts", [], delimiter)
-zookeeper_hosts = default_string("/clusterHostInfo/zookeeper_hosts", [], 
delimiter)
+zookeeper_hosts = default_string("/clusterHostInfo/zookeeper_server_hosts", 
[], delimiter)
 client_hosts = default_string("/clusterHostInfo/client_hosts", [], delimiter)
 hbase_master = default_string("/clusterHostInfo/hbase_master_hosts", [], 
delimiter)
 hbase_regionservers = default_string("/clusterHostInfo/hbase_rs_hosts", [], 
delimiter)

-- 
To stop receiving notification emails like this one, please contact
oleew...@apache.org.

Reply via email to