Fixes Openstack HA install failures when configured on different node…

…s from config nodes : Bug #1521511 Change-Id: I0be5fc33e1eca36b31149e6589773f036f4950b2
Juniper · Feb 12, 2016 · b2d496b · b2d496b
1 parent bf2d8a4
commit b2d496b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/fabfile/tasks/helpers.py b/fabfile/tasks/helpers.py
@@ -1309,12 +1309,12 @@ def pre_check():
         exit(1)
     if (len(env.roledefs['openstack']) > 1 and
         set(env.roledefs['openstack']) == set(env.roledefs['cfgm']) and
-        get_openstack_internal_vip() != get_openstack_internal_vip()):
+        get_openstack_internal_vip() != get_contrail_internal_vip()):
         print "\nERROR: \n\tOpenstack and cfgm nodes are same, No need for contrail_internal_vip to be specified in testbed.py."
         exit(1)
     if (len(env.roledefs['openstack']) > 1 and
         set(env.roledefs['openstack']) != set(env.roledefs['cfgm']) and
-        get_openstack_internal_vip() == get_openstack_internal_vip()):
+        get_openstack_internal_vip() == get_contrail_internal_vip()):
         print "\nERROR: \n\tOpenstack and cfgm nodes are different, Need to specify  contrail_internal_vip testbed.py."
         exit(1)
     else: