Openstack HA : provisioning is failing when openstack nodes are configured separate from config nodes

[venu kolli]

Install is failing when we openstack HA is configured on 3 separate nodes other than config nodes.

env.roledefs = {
    'all': [host1, host2, host3,host4,host5,host6,host7],
    'cfgm': [host1, host2,host3],
    'openstack': [host5, host6,host7],
    'control': [host1,host2,host3],
    'compute': [host4],
    'collector': [host1, host2,host3],
    'webui': [host1, host2,host3],
    'database': [host1, host2,host3],
    'build': [host_build],
}

Follow error occurs during installation .
2015-11-30 11:14:02:296120:
2015-11-30 11:14:02:296346: Time synced in the nodes, Proceeding to install/provision.
2015-11-30 11:14:02:330220:
2015-11-30 11:14:02:348822: ERROR:
2015-11-30 11:14:02:348822: Openstack and cfgm nodes are different, Need to specify contrail_internal_vip testbed.py.
2015-11-30 11:14:02:348934: Disconnecting from 99.1.1.6... done.
2015-11-30 11:14:02:413468: Disconnecting from 99.1.1.5... done.

Lines 1306 and 1311 needs to be modified in /opt/contrail/utils/fabfile/tasks/helpers.py

1301 if len(env.roledefs['openstack']) > 1 and not get_openstack_internal_vip():
1302 print "\nERROR: \n\tkeystone_ip(VIP) needs to be set in testbed.py for HA, when more than one openstack node is defined."
1303 exit(1)
1304 if (len(env.roledefs['openstack']) > 1 and
1305 set(env.roledefs['openstack']) == set(env.roledefs['cfgm']) and
1306 get_openstack_internal_vip() != get_openstack_internal_vip()): ==> needs to be modified to get_contrail_internal_vip()
1307 print "\nERROR: \n\tOpenstack and cfgm nodes are same, No need for contrail_internal_vip to be specified in testbed.py."
1308 exit(1)
1309 if (len(env.roledefs['openstack']) > 1 and
1310 set(env.roledefs['openstack']) != set(env.roledefs['cfgm']) and
1311 get_openstack_internal_vip() == get_openstack_internal_vip()): ==> needs to be modified to get_contrail_internal_vip()
1312 print "\nERROR: \n\tOpenstack and cfgm nodes are different, Need to specify contrail_internal_vip testbed.py."
1313 exit(1)

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/15516
Submitter: venu kolli (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/15516
Committed: http://github.org/Juniper/contrail-fabric-utils/commit/e6711d7e9523183528587ca1f9dae34f5d32cb82
Submitter: Zuul
Branch: master

commit e6711d7e9523183528587ca1f9dae34f5d32cb82
Author: venu kolli <email address hidden>
Date: Tue Dec 1 00:35:02 2015 -0800

Fixes Openstack HA install failures when configured on different nodes from config nodes : Bug #1521511

Change-Id: I0be5fc33e1eca36b31149e6589773f036f4950b2

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/15552
Submitter: venu kolli (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/17196
Submitter: venu kolli (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/17197
Submitter: venu kolli (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/17197
Committed: http://github.org/Juniper/contrail-fabric-utils/commit/b2d496b6f9320fcda9db4844080a66d9f43a9a83
Submitter: Zuul
Branch: R2.21.x

commit b2d496b6f9320fcda9db4844080a66d9f43a9a83
Author: venu kolli <email address hidden>
Date: Tue Dec 1 00:35:02 2015 -0800

Fixes Openstack HA install failures when configured on different nodes from config nodes : Bug #1521511

Change-Id: I0be5fc33e1eca36b31149e6589773f036f4950b2

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/17196
Committed: http://github.org/Juniper/contrail-fabric-utils/commit/d96f0b39a65f3ce29bfcca2cd5e77e3bbe21154a
Submitter: Zuul
Branch: R2.22.x

commit d96f0b39a65f3ce29bfcca2cd5e77e3bbe21154a
Author: venu kolli <email address hidden>
Date: Tue Dec 1 00:35:02 2015 -0800

Fixes Openstack HA install failures when configured on different nodes from config nodes : Bug #1521511

Change-Id: I0be5fc33e1eca36b31149e6589773f036f4950b2

[venu kolli (vkolli)]

removing the scope for 3.0 , already present in 3.0 and in master .