From 891d609fc87aba12e0c88198686cc083cca43c24 Mon Sep 17 00:00:00 2001 From: Raj Reddy Date: Tue, 12 Jul 2016 16:13:11 -0700 Subject: [PATCH] make control_ip_list optional, so we are allowed to install analytics/config only without control Change-Id: I7ce37f25b961f3ad3969936d5965e115dac19aec Closes-Bug: #1601897 (cherry picked from commit 6b96a5c76c7a53e5fb63bf1e51b34dd705b99b24) --- fabfile/utils/commandline.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/fabfile/utils/commandline.py b/fabfile/utils/commandline.py index 7b5be9a69..fca163c66 100644 --- a/fabfile/utils/commandline.py +++ b/fabfile/utils/commandline.py @@ -142,8 +142,10 @@ def frame_vnc_config_cmd(host_string, cmd="setup-vnc-config"): mt_opt = '--multi_tenancy' if get_mt_enable() else '' cassandra_ip_list = [hstr_to_ip(get_control_host_string(cassandra_host))\ for cassandra_host in env.roledefs['database']] - control_ip_list = [hstr_to_ip(get_control_host_string(control_host))\ - for control_host in env.roledefs['control']] + control_ip_list = [] + if 'control' in env.roledefs: + control_ip_list = [hstr_to_ip(get_control_host_string(control_host))\ + for control_host in env.roledefs['control']] orch = get_orchestrator() cassandra_user = get_cassandra_user() @@ -153,7 +155,8 @@ def frame_vnc_config_cmd(host_string, cmd="setup-vnc-config"): cmd += " --collector_ip %s %s" % (collector_ip, mt_opt) cmd += " --cassandra_ip_list %s" % ' '.join(cassandra_ip_list) cmd += " --zookeeper_ip_list %s" % ' '.join(cassandra_ip_list) - cmd += " --control_ip_list %s" % ' '.join(control_ip_list) + if control_ip_list: + cmd += " --control_ip_list %s" % ' '.join(control_ip_list) cmd += " --quantum_port %s" % quantum_port cmd += " --nworkers %d" % nworkers cmd += " --service_token %s" % get_service_token()