Skip to content

Commit

Permalink
Merge "Using get_contrail_internal_vip to determine the discovery ip …
Browse files Browse the repository at this point in the history
…to handle cfgm/openstack roles in different set of nodes." into R3.0
  • Loading branch information
Zuul authored and opencontrail-ci-admin committed Oct 6, 2016
2 parents 7799503 + d24ccc0 commit 9715867
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion fabfile/tasks/provision.py
Original file line number Diff line number Diff line change
Expand Up @@ -2102,7 +2102,7 @@ def add_tor_agent_by_index(index, node_info, restart=True):
cmd += " --tor_ovs_protocol %s" % toragent_dict[host_string][i]['tor_ovs_protocol']
cmd += " --tor_agent_ovs_ka %s" % tor_agent_ovs_ka
# HA arguments
internal_vip = get_openstack_internal_vip()
internal_vip = get_contrail_internal_vip()
if internal_vip:
# Highly availbale setup
cmd += " --discovery_server_ip %s" % internal_vip
Expand Down

0 comments on commit 9715867

Please sign in to comment.