Skip to content

Commit

Permalink
Closes-Bug: #1635038
Browse files Browse the repository at this point in the history
cassandra_ip_list: take from config node ip, instead of database node ips.

Change-Id: I0cbd37d10c3c8f0778cbc2a624dbb1b5aaf76791
(cherry picked from commit 62ea230)
  • Loading branch information
biswajit-mandal committed Oct 19, 2016
1 parent 43b2149 commit e8a8756
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions fabfile/utils/commandline.py
Original file line number Diff line number Diff line change
Expand Up @@ -291,9 +291,6 @@ def frame_vnc_webui_cmd(host_string, cmd="setup-vnc-webui"):
cfgm_ip = hstr_to_ip(cfgm_host)
webui_host = get_control_host_string(host_string)
ncollectors = len(env.roledefs['collector'])
database_host_list=[]
for entry in env.roledefs['database']:
database_host_list.append(get_control_host_string(entry))
webui_host_list=[]
for entry in env.roledefs['webui']:
webui_host_list.append(get_control_host_string(entry))
Expand All @@ -306,7 +303,6 @@ def frame_vnc_webui_cmd(host_string, cmd="setup-vnc-webui"):
hindex = hindex % ncollectors
collector_host = get_control_host_string(env.roledefs['collector'][hindex])
collector_ip = hstr_to_ip(collector_host)
cassandra_ip_list = [hstr_to_ip(cassandra_host) for cassandra_host in database_host_list]
orch = get_orchestrator()

# If redis password is specified in testbed file, then add that to the
Expand All @@ -316,7 +312,7 @@ def frame_vnc_webui_cmd(host_string, cmd="setup-vnc-webui"):
cmd += " --cfgm_ip %s" % cfgm_ip
cmd += " --apiserver_auth_protocol %s" % get_apiserver_protocol()
cmd += " --collector_ip %s" % collector_ip
cmd += " --cassandra_ip_list %s" % ' '.join(cassandra_ip_list)
cmd += " --cassandra_ip_list %s" % ' '.join(get_config_db_ip_list())
cmd += " --orchestrator %s" % orch
if redis_password is not None:
cmd += " --redis_password %s" % redis_password
Expand Down

0 comments on commit e8a8756

Please sign in to comment.