From 2648b1f6d57f1c49e98ee8c1f2b1539a367c4911 Mon Sep 17 00:00:00 2001 From: Ranjeet R Date: Fri, 6 Jan 2017 21:57:03 -0800 Subject: [PATCH] Fixes: fab join_cluster aborts for adding redhat node to ha cluster Fixing the call to modify zookeeper config to the wrapper call due to another code change which cchanged the signature of the call Fixing code to generate user/password for ifmap server. Change-Id: Ie8c8d48ab6aa0550d57dc305cd3d51e91a0da02f Closes-Bug: 1654151 --- contrail_provisioning/config/common.py | 14 ++++++-------- contrail_provisioning/database/setup.py | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/contrail_provisioning/config/common.py b/contrail_provisioning/config/common.py index c4eaf95e..52709411 100755 --- a/contrail_provisioning/config/common.py +++ b/contrail_provisioning/config/common.py @@ -45,12 +45,10 @@ def __init__(self, config_args, args_str=None): self.zk_servers_ports = ','.join(['%s:2181' %(s)\ for s in self._args.zookeeper_ip_list]) - # These changes needs to go after fabric changes go inside. This will be - # uncommented once fabric changes go through. - #self.control_node_users = '\n'.join(['%s:%s' %(s, s)\ - # for s in self._args.control_ip_list]) - #self.control_node_dns_users = '\n'.join(['%s.dns:%s.dns' %(s, s)\ - # for s in self._args.control_ip_list]) + self.control_node_users = '\n'.join(['%s:%s' %(s, s)\ + for s in self._args.control_ip_list]) + self.control_node_dns_users = '\n'.join(['%s.dns:%s.dns' %(s, s)\ + for s in self._args.control_ip_list]) amqp_ip_list = [self.cfgm_ip] if self._args.amqp_ip_list: amqp_ip_list = self._args.amqp_ip_list @@ -100,8 +98,8 @@ def fixup_ifmap_config_files(self): # basicauthusers.properties template_vals = { - # '__contrail_control_node_users__' : self.control_node_users, - # '__contrail_control_node_dns_users__' : self.control_node_dns_users, + '__contrail_control_node_users__' : self.control_node_users, + '__contrail_control_node_dns_users__' : self.control_node_dns_users, } self._template_substitute_write(ifmap_basicauthusers.template, template_vals, self._temp_dir_name + '/basicauthusers.properties') diff --git a/contrail_provisioning/database/setup.py b/contrail_provisioning/database/setup.py index 82cac154..9474c819 100755 --- a/contrail_provisioning/database/setup.py +++ b/contrail_provisioning/database/setup.py @@ -287,7 +287,7 @@ def main(args_str = None): def update_zookeeper_servers(args_str = None): database = DatabaseSetup(args_str) - database.fix_zookeeper_servers_config() + database.fixup_zookeeper_configs() database.fixup_kafka_server_properties(database.database_listen_ip) def restart_zookeeper_server(args_str = None):