From 6e735cf77f286f0133b5e7606c5bbbb81b567936 Mon Sep 17 00:00:00 2001 From: tsurendra Date: Thu, 12 Feb 2015 11:26:56 -0800 Subject: [PATCH] Partial-Bug: #1413364 On multi-interface, Allowed hosts should have contraol_data ip list. Change-Id: Id529ef6220ee919a8435b1b9824b67db254ef165 --- src/server_mgr_puppet.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/server_mgr_puppet.py b/src/server_mgr_puppet.py index 5201c050..4daec881 100644 --- a/src/server_mgr_puppet.py +++ b/src/server_mgr_puppet.py @@ -2058,10 +2058,16 @@ def build_openstack_hiera_file( # Get all values needed to fill he template. self_ip = server.get("ip_address", "") openstack_ip = cluster_params.get("internal_vip", None) + + os_ip_list = [self.get_control_ip(provision_params, x["ip_address"].encode('ascii')) \ + for x in cluster_servers if 'openstack' in set(eval(x['roles']))] + + config_ip_list = [self.get_control_ip(provision_params, x["ip_address"].encode('ascii')) \ + for x in cluster_servers if 'config' in set(eval(x['roles']))] + if openstack_ip != None and openstack_ip != "": mysql_allowed_hosts.append(openstack_ip) - mysql_allowed_hosts = mysql_allowed_hosts + list(set(role_ips_dict['openstack'] + role_ips_dict['config'])) - + mysql_allowed_hosts = mysql_allowed_hosts + list(set(os_ip_list + config_ip_list )) if openstack_ip is None or openstack_ip == '': if self_ip in role_ips_dict['openstack']: