Fix conflict between OpenStack and Telemetry VIP
In production deployments, OpenStack and Telemetry VIP addresses are
located on different clusters. This isn't the case here which leads to
duplicate entries for the same address in the keepalived configuration.
This change fixes this problem by allocating a new address for the
Telemetry cluster.
Change-Id: I663b93995f4426fa5d828cb135e1da57d0e320ca
diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml
index abc4a46..a115aac 100755
--- a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml
@@ -46,6 +46,7 @@
parameters:
_param:
keepalived_vip_interface: ens4
+ keepalived_openstack_telemetry_vip_address: 172.16.10.252
cluster_vip_address: ${_param:openstack_control_address}
cluster_local_address: ${_param:single_address}
cluster_node01_hostname: ctl01
diff --git a/classes/cluster/virtual-mcp11-contrail/openstack/control.yml b/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
index 8ad024a..2887191 100755
--- a/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
@@ -45,6 +45,7 @@
parameters:
_param:
keepalived_vip_interface: ens4
+ keepalived_openstack_telemetry_vip_address: 172.16.10.252
cluster_vip_address: ${_param:openstack_control_address}
cluster_local_address: ${_param:single_address}
cluster_node01_hostname: ctl01
diff --git a/classes/cluster/virtual-mcp11-dvr/openstack/control.yml b/classes/cluster/virtual-mcp11-dvr/openstack/control.yml
index dd6fc11..2403464 100644
--- a/classes/cluster/virtual-mcp11-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-dvr/openstack/control.yml
@@ -39,6 +39,7 @@
parameters:
_param:
keepalived_vip_interface: ens4
+ keepalived_openstack_telemetry_vip_address: 172.16.10.252
keepalived_openstack_telemetry_vip_interface: ens4
linux:
system:
diff --git a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/control.yml b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/control.yml
index 98f1154..ca478b9 100644
--- a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/control.yml
@@ -36,6 +36,7 @@
parameters:
_param:
keepalived_vip_interface: ens4
+ keepalived_openstack_telemetry_vip_address: 172.16.10.252
keepalived_openstack_telemetry_vip_interface: ens4
linux:
system:
diff --git a/classes/cluster/virtual-mcp11-ovs/openstack/control.yml b/classes/cluster/virtual-mcp11-ovs/openstack/control.yml
index 9a94459..9f0477a 100644
--- a/classes/cluster/virtual-mcp11-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-ovs/openstack/control.yml
@@ -33,6 +33,7 @@
parameters:
_param:
keepalived_vip_interface: ens4
+ keepalived_openstack_telemetry_vip_address: 172.16.10.252
keepalived_openstack_telemetry_vip_interface: ens4
linux:
system: