From 6606e9ec12d4965ef5b1287fd9cb1daaafc0d710 Mon Sep 17 00:00:00 2001 From: Kumar Harsh Date: Thu, 3 Nov 2016 14:31:16 +0530 Subject: [PATCH] When mgmt ip and control_data ip is different control_data ip should be added to gateway_server_ip_list Closes-Bug: #1638841 Conflicts: fabfile/utils/cluster.py Change-Id: Ie627db678c36bd225899b6932a4db647ee961c7a --- fabfile/utils/cluster.py | 4 ++-- fabfile/utils/interface.py | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/fabfile/utils/cluster.py b/fabfile/utils/cluster.py index 2ebf81e1b..ec7012fd4 100644 --- a/fabfile/utils/cluster.py +++ b/fabfile/utils/cluster.py @@ -5,7 +5,7 @@ from fabos import detect_ostype, get_release, get_build from fabfile.config import * from fabfile.utils.config import get_value - +from fabfile.utils.interface import get_data_ip def get_all_hostnames(): if isinstance(env.hostnames.get('all', None), list): @@ -115,7 +115,7 @@ def get_compute_as_gateway_list(): if gateway_mode_info: for host in gateway_mode_info.keys(): if( gateway_mode_info[host] == 'server' ): - gateway_server_ip_list.append(host.split('@')[1]) + gateway_server_ip_list.append(get_data_ip(host)[0]) return gateway_server_ip_list def get_vmware_details(compute_host_string): diff --git a/fabfile/utils/interface.py b/fabfile/utils/interface.py index d1c958f9b..e0f8d8745 100644 --- a/fabfile/utils/interface.py +++ b/fabfile/utils/interface.py @@ -4,7 +4,6 @@ from fabric.api import * from fabfile.config import testbed -from fabfile.utils.host import hstr_to_ip from fabric.exceptions import CommandTimeout @task @@ -40,9 +39,9 @@ def get_data_ip(host_str): tgt_ip = str(IPNetwork(data_ip_info[host_str]['ip']).ip) tgt_gw = data_ip_info[host_str]['gw'] else: - tgt_ip = hstr_to_ip(host_str) + tgt_ip = host_str.split('@')[1] else: - tgt_ip = hstr_to_ip(host_str) + tgt_ip = host_str.split('@')[1] return (tgt_ip, tgt_gw) #end get_data_ip