Remove openstack_telemetry keepalived instance parameters
Change-Id: I7257cdb5cbc2346e5e33e18a4d51219adbf6ddc0
Closes-bug: PROD-14895
diff --git a/classes/cluster/os-ha-contrail-40/openstack/control.yml b/classes/cluster/os-ha-contrail-40/openstack/control.yml
index e3c086f..7fd147b 100644
--- a/classes/cluster/os-ha-contrail-40/openstack/control.yml
+++ b/classes/cluster/os-ha-contrail-40/openstack/control.yml
@@ -43,7 +43,6 @@
cluster_node02_address: ${_param:openstack_control_node02_address}
cluster_node03_hostname: ctl03
cluster_node03_address: ${_param:openstack_control_node03_address}
- keepalived_openstack_telemetry_vip_interface: ens4
linux:
system:
package:
@@ -164,4 +163,3 @@
notification:
driver: messagingv2
topics: "notifications"
-
diff --git a/classes/cluster/os-ha-contrail/openstack/control.yml b/classes/cluster/os-ha-contrail/openstack/control.yml
index 1e9733a..ce6c800 100755
--- a/classes/cluster/os-ha-contrail/openstack/control.yml
+++ b/classes/cluster/os-ha-contrail/openstack/control.yml
@@ -46,7 +46,6 @@
cluster_node02_address: ${_param:openstack_control_node02_address}
cluster_node03_hostname: ctl03
cluster_node03_address: ${_param:openstack_control_node03_address}
- keepalived_openstack_telemetry_vip_interface: ens4
linux:
system:
package:
@@ -174,4 +173,3 @@
notification:
driver: messagingv2
topics: "notifications"
-
diff --git a/classes/cluster/os-ha-ovs-syndic/openstack/control.yml b/classes/cluster/os-ha-ovs-syndic/openstack/control.yml
index 9bc0f6e..0b7f2a2 100644
--- a/classes/cluster/os-ha-ovs-syndic/openstack/control.yml
+++ b/classes/cluster/os-ha-ovs-syndic/openstack/control.yml
@@ -32,7 +32,6 @@
parameters:
_param:
keepalived_vip_interface: ens4
- keepalived_openstack_telemetry_vip_interface: ens4
linux:
system:
package:
@@ -100,4 +99,3 @@
notification:
driver: messagingv2
topics: "notifications"
-
diff --git a/classes/cluster/os-ha-ovs/openstack/control.yml b/classes/cluster/os-ha-ovs/openstack/control.yml
index ee20aa0..a01afb8 100644
--- a/classes/cluster/os-ha-ovs/openstack/control.yml
+++ b/classes/cluster/os-ha-ovs/openstack/control.yml
@@ -35,7 +35,6 @@
parameters:
_param:
keepalived_vip_interface: ens4
- keepalived_openstack_telemetry_vip_interface: ens4
linux:
system:
package:
@@ -147,4 +146,3 @@
notification:
driver: messagingv2
topics: "notifications"
-
diff --git a/classes/cluster/sl-os-ovs/openstack/control.yml b/classes/cluster/sl-os-ovs/openstack/control.yml
index 0c6cbeb..ea1cdd6 100644
--- a/classes/cluster/sl-os-ovs/openstack/control.yml
+++ b/classes/cluster/sl-os-ovs/openstack/control.yml
@@ -32,7 +32,6 @@
parameters:
_param:
keepalived_vip_interface: ens4
- keepalived_openstack_telemetry_vip_interface: ens4
linux:
system:
package:
@@ -103,4 +102,3 @@
notification:
driver: messagingv2
topics: "notifications,${_param:stacklight_notification_topic}"
-
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/openstack/control.yml b/classes/cluster/virtual-mcp-ocata-cicd/openstack/control.yml
index e10b2a0..8d2061d 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/openstack/control.yml
@@ -39,7 +39,6 @@
_param:
glusterfs_service_host: ${_param:cluster_vip_address}
keepalived_vip_interface: ens4
- keepalived_openstack_telemetry_vip_interface: ens4
linux_system_codename: xenial
linux:
system:
@@ -152,4 +151,3 @@
notification:
driver: messagingv2
topics: "notifications,${_param:stacklight_notification_topic}"
-
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/openstack/control.yml b/classes/cluster/virtual-mcp-ocata-dvr/openstack/control.yml
index 8e756a2..650e02a 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/openstack/control.yml
@@ -41,8 +41,6 @@
parameters:
_param:
keepalived_vip_interface: ens4
- keepalived_openstack_telemetry_vip_interface: ens4
- keepalived_openstack_telemetry_vip_address: 172.16.10.252
linux:
system:
package:
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml b/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
index c88b3f9..81d89f7 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
@@ -42,7 +42,6 @@
parameters:
_param:
keepalived_vip_interface: ens4
- keepalived_openstack_telemetry_vip_interface: ens4
linux:
system:
package:
@@ -154,4 +153,3 @@
notification:
driver: messagingv2
topics: "notifications,${_param:stacklight_notification_topic}"
-
diff --git a/classes/cluster/virtual-mcp10-contrail/openstack/control.yml b/classes/cluster/virtual-mcp10-contrail/openstack/control.yml
index 46d5e14..3295d9c 100755
--- a/classes/cluster/virtual-mcp10-contrail/openstack/control.yml
+++ b/classes/cluster/virtual-mcp10-contrail/openstack/control.yml
@@ -47,7 +47,6 @@
parameters:
_param:
keepalived_vip_interface: eth1
- keepalived_openstack_telemetry_vip_address: 172.16.10.251
cluster_vip_address: ${_param:openstack_control_address}
cluster_local_address: ${_param:single_address}
cluster_node01_hostname: ctl01
diff --git a/classes/cluster/virtual-mcp10-dvr/openstack/control.yml b/classes/cluster/virtual-mcp10-dvr/openstack/control.yml
index 515cb99..7a60877 100644
--- a/classes/cluster/virtual-mcp10-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp10-dvr/openstack/control.yml
@@ -33,7 +33,6 @@
parameters:
_param:
keepalived_vip_interface: eth1
- keepalived_openstack_telemetry_vip_address: 172.16.10.252
linux:
system:
package:
diff --git a/classes/cluster/virtual-mcp10-ovs/openstack/control.yml b/classes/cluster/virtual-mcp10-ovs/openstack/control.yml
index 01358b1..62bb45c 100644
--- a/classes/cluster/virtual-mcp10-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-mcp10-ovs/openstack/control.yml
@@ -32,7 +32,6 @@
parameters:
_param:
keepalived_vip_interface: eth1
- keepalived_openstack_telemetry_vip_address: 172.16.10.252
linux:
system:
package:
@@ -100,4 +99,3 @@
notification:
driver: messagingv2
topics: "notifications,${_param:stacklight_notification_topic}"
-
diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml
index f319493..975d121 100755
--- a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml
@@ -46,7 +46,6 @@
parameters:
_param:
keepalived_vip_interface: ens4
- keepalived_openstack_telemetry_vip_address: 172.16.10.251
cluster_vip_address: ${_param:openstack_control_address}
cluster_local_address: ${_param:single_address}
cluster_node01_hostname: ctl01
@@ -55,7 +54,6 @@
cluster_node02_address: ${_param:openstack_control_node02_address}
cluster_node03_hostname: ctl03
cluster_node03_address: ${_param:openstack_control_node03_address}
- keepalived_openstack_telemetry_vip_interface: ens4
linux:
system:
package:
diff --git a/classes/cluster/virtual-mcp11-contrail/openstack/control.yml b/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
index 0415236..5cd7f19 100755
--- a/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
@@ -44,7 +44,6 @@
parameters:
_param:
keepalived_vip_interface: ens4
- keepalived_openstack_telemetry_vip_address: 172.16.10.251
cluster_vip_address: ${_param:openstack_control_address}
cluster_local_address: ${_param:single_address}
cluster_node01_hostname: ctl01
@@ -53,7 +52,6 @@
cluster_node02_address: ${_param:openstack_control_node02_address}
cluster_node03_hostname: ctl03
cluster_node03_address: ${_param:openstack_control_node03_address}
- keepalived_openstack_telemetry_vip_interface: ens4
linux:
system:
package:
diff --git a/classes/cluster/virtual-mcp11-dvr/openstack/control.yml b/classes/cluster/virtual-mcp11-dvr/openstack/control.yml
index 12431c9..ee9785b 100644
--- a/classes/cluster/virtual-mcp11-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-dvr/openstack/control.yml
@@ -38,8 +38,6 @@
parameters:
_param:
keepalived_vip_interface: ens4
- keepalived_openstack_telemetry_vip_address: 172.16.10.252
- keepalived_openstack_telemetry_vip_interface: ens4
linux:
system:
package:
diff --git a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/control.yml b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/control.yml
index 8d86179..2e2ec97 100644
--- a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/control.yml
@@ -36,8 +36,6 @@
parameters:
_param:
keepalived_vip_interface: ens4
- keepalived_openstack_telemetry_vip_address: 172.16.10.252
- keepalived_openstack_telemetry_vip_interface: ens4
linux:
system:
package:
@@ -149,4 +147,3 @@
notification:
driver: messagingv2
topics: "notifications,${_param:stacklight_notification_topic}"
-
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/control.yml b/classes/cluster/virtual-mcp11-ovs-ironic/openstack/control.yml
index c2b5b99..0a88de2 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/openstack/control.yml
@@ -38,10 +38,8 @@
parameters:
_param:
keepalived_vip_interface: ens4
- keepalived_openstack_telemetry_vip_interface: ens4
cluster_vip_address: ${_param:openstack_control_address}
cluster_local_address: ${_param:single_address}
- keepalived_openstack_telemetry_vip_interface: ens4
linux:
system:
package:
@@ -109,4 +107,3 @@
notification:
driver: messagingv2
topics: "notifications,${_param:stacklight_notification_topic}"
-
diff --git a/classes/cluster/virtual-mcp11-ovs/openstack/control.yml b/classes/cluster/virtual-mcp11-ovs/openstack/control.yml
index 9f0477a..7617480 100644
--- a/classes/cluster/virtual-mcp11-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-ovs/openstack/control.yml
@@ -33,8 +33,6 @@
parameters:
_param:
keepalived_vip_interface: ens4
- keepalived_openstack_telemetry_vip_address: 172.16.10.252
- keepalived_openstack_telemetry_vip_interface: ens4
linux:
system:
package:
@@ -102,4 +100,3 @@
notification:
driver: messagingv2
topics: "notifications,${_param:stacklight_notification_topic}"
-