aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/reclass
diff options
context:
space:
mode:
Diffstat (limited to 'mcp/reclass')
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/config.yml14
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/init.yml12
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/kvm.yml3
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/maas.yml3
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_compute.yml3
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_control.yml7
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_database.yml7
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_interface_vcp_biport.yml27
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_interface_vcp_triport.yml45
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_message_queue.yml7
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_proxy.yml34
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_telemetry.yml7
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/opendaylight/control.yml7
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml1
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml1
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml1
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml1
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml1
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control.yml1
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database.yml1
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/message_queue.yml1
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml1
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml1
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml1
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml1
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml1
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml1
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml1
28 files changed, 100 insertions, 91 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/config.yml
index f2a4dbe43..123bcc443 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/config.yml
@@ -41,8 +41,18 @@ parameters:
linux:
network:
interface:
- dhcp: ${_param:linux_dhcp_interface}
- single: ${_param:linux_single_interface}
+ dhcp:
+ enabled: true
+ type: eth
+ proto: dhcp
+ name: ${_param:dhcp_nic}
+ single:
+ enabled: true
+ type: eth
+ proto: static
+ name: ${_param:single_nic}
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
salt:
master:
accept_policy: open_mode
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/init.yml
index a7a04044d..e55f9ce2e 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/init.yml
@@ -47,18 +47,6 @@ parameters:
storage:
node:
name: default
- linux_dhcp_interface:
- enabled: true
- type: eth
- proto: dhcp
- name: ${_param:dhcp_nic}
- linux_single_interface:
- enabled: true
- type: eth
- proto: static
- name: ${_param:single_nic}
- address: ${_param:single_address}
- netmask: 255.255.255.0
# yamllint disable-line rule:line-length
salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/kvm.yml
index 035129dca..2e65d16af 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/kvm.yml
@@ -34,9 +34,6 @@ parameters:
cluster_node03_address: ${_param:infra_kvm_node03_address}
keepalived_vip_interface: br-ctl
keepalived_vip_virtual_router_id: 69
- # {dhcp,single}_nic are not used, but referenced
- dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface}
- single_nic: ${_param:opnfv_vcp_vm_secondary_interface}
linux:
network:
remove_iface_files:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/maas.yml
index 93db0ed14..56cd96b5b 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/maas.yml
@@ -23,9 +23,6 @@ parameters:
maas_db_password: opnfv_secret
dns_server01: ${_param:opnfv_dns_server01}
single_address: ${_param:infra_maas_node01_deploy_address}
- # {dhcp,single}_nic are not used, but referenced
- dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface}
- single_nic: ${_param:opnfv_vcp_vm_secondary_interface}
maas:
region:
salt_master_ip: ${_param:infra_config_deploy_address}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_compute.yml
index ee36ece23..e72d3a767 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_compute.yml
@@ -36,9 +36,6 @@ parameters:
loopback_device_size: 20
linux_system_codename: xenial
glusterfs_version: '3.10'
- # {dhcp,single}_nic are not used, but referenced
- dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface}
- single_nic: ${_param:opnfv_vcp_vm_secondary_interface}
glusterfs:
client:
volumes:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_control.yml
index ce82807ce..9bf04f090 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_control.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_control.yml
@@ -41,13 +41,6 @@ parameters:
cluster_node03_address: ${_param:openstack_control_node03_address}
nova_vncproxy_url: https://${_param:cluster_public_host}:6080
glusterfs_version: '3.10'
- dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface}
- single_nic: ${_param:opnfv_vcp_vm_secondary_interface}
- linux:
- network:
- interface:
- dhcp: ${_param:linux_dhcp_interface}
- single: ${_param:linux_single_interface}
neutron:
server:
vlan_aware_vms: true
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_database.yml
index 7ed588d9b..7e3424146 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_database.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_database.yml
@@ -35,10 +35,3 @@ parameters:
cluster_node02_address: ${_param:openstack_database_node02_address}
cluster_node03_hostname: dbs03
cluster_node03_address: ${_param:openstack_database_node03_address}
- dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface}
- single_nic: ${_param:opnfv_vcp_vm_secondary_interface}
- linux:
- network:
- interface:
- dhcp: ${_param:linux_dhcp_interface}
- single: ${_param:linux_single_interface}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_interface_vcp_biport.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_interface_vcp_biport.yml
new file mode 100644
index 000000000..3c7f3e29a
--- /dev/null
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_interface_vcp_biport.yml
@@ -0,0 +1,27 @@
+##############################################################################
+# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+parameters:
+ _param:
+ dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface}
+ single_nic: ${_param:opnfv_vcp_vm_secondary_interface}
+ linux:
+ network:
+ interface:
+ dhcp:
+ enabled: true
+ type: eth
+ proto: dhcp
+ name: ${_param:dhcp_nic}
+ single:
+ enabled: true
+ type: eth
+ proto: static
+ name: ${_param:single_nic}
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_interface_vcp_triport.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_interface_vcp_triport.yml
new file mode 100644
index 000000000..cef2a8881
--- /dev/null
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_interface_vcp_triport.yml
@@ -0,0 +1,45 @@
+##############################################################################
+# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+parameters:
+ _param:
+ dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface}
+ single_nic: ${_param:opnfv_vcp_vm_secondary_interface}
+ control_nic: ${_param:opnfv_vcp_vm_tertiary_interface}
+ linux:
+ network:
+ interface:
+ dhcp_int:
+ enabled: true
+ type: eth
+ proto: dhcp
+ name: ${_param:dhcp_nic}
+ route:
+ mcpcontol:
+ address: ${_param:opnfv_net_mcpcontrol}
+ netmask: ${_param:opnfv_net_mcpcontrol_mask}
+ gateway: ${_param:opnfv_infra_maas_node01_deploy_address}
+ single_int:
+ enabled: true
+ type: eth
+ proto: static
+ name: ${_param:single_nic}
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
+ route:
+ public:
+ address: 0.0.0.0
+ netmask: 0.0.0.0
+ gateway: ${_param:opnfv_net_public_gw}
+ control_int:
+ enabled: true
+ type: eth
+ proto: static
+ name: ${_param:control_nic}
+ address: ${_param:control_address}
+ netmask: 255.255.255.0
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_message_queue.yml
index 88affb84a..ef1bb1a4d 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_message_queue.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_message_queue.yml
@@ -23,10 +23,3 @@ parameters:
cluster_node02_address: ${_param:openstack_message_queue_node02_address}
cluster_node03_hostname: msg03
cluster_node03_address: ${_param:openstack_message_queue_node03_address}
- dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface}
- single_nic: ${_param:opnfv_vcp_vm_secondary_interface}
- linux:
- network:
- interface:
- dhcp: ${_param:linux_dhcp_interface}
- single: ${_param:linux_single_interface}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_proxy.yml
index 031955606..98b3b4c81 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_proxy.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_proxy.yml
@@ -30,41 +30,7 @@ parameters:
mode: secure
cluster_vip_address: ${_param:openstack_proxy_address}
salt_minion_ca_host: cfg01.${_param:cluster_domain}
- dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface}
- single_nic: ${_param:opnfv_vcp_vm_secondary_interface}
- control_nic: ${_param:opnfv_vcp_vm_tertiary_interface}
linux:
- network:
- interface:
- dhcp_int:
- enabled: true
- type: eth
- proto: dhcp
- name: ${_param:dhcp_nic}
- route:
- mcpcontol:
- address: ${_param:opnfv_net_mcpcontrol}
- netmask: ${_param:opnfv_net_mcpcontrol_mask}
- gateway: ${_param:opnfv_infra_maas_node01_deploy_address}
- single_int:
- enabled: true
- type: eth
- proto: static
- name: ${_param:single_nic}
- address: ${_param:single_address}
- netmask: 255.255.255.0
- route:
- public:
- address: 0.0.0.0
- netmask: 0.0.0.0
- gateway: ${_param:opnfv_net_public_gw}
- control_int:
- enabled: true
- type: eth
- proto: static
- name: ${_param:control_nic}
- address: ${_param:control_address}
- netmask: 255.255.255.0
system:
package:
libapache2-mod-wsgi:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_telemetry.yml
index c52b5ed79..52337388d 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_telemetry.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_telemetry.yml
@@ -28,13 +28,6 @@ parameters:
cluster_node02_address: ${_param:openstack_telemetry_node02_address}
cluster_node03_hostname: mdb03
cluster_node03_address: ${_param:openstack_telemetry_node03_address}
- dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface}
- single_nic: ${_param:opnfv_vcp_vm_secondary_interface}
- linux:
- network:
- interface:
- dhcp: ${_param:linux_dhcp_interface}
- single: ${_param:linux_single_interface}
mongodb:
server:
logging:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/opendaylight/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/opendaylight/control.yml
index edb1a338f..2c47c5765 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/opendaylight/control.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/opendaylight/control.yml
@@ -10,16 +10,11 @@ classes:
- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
- system.opendaylight.server.single
+ - cluster.baremetal-mcp-ocata-common-ha.openstack_interface_vcp_biport
- cluster.baremetal-mcp-ocata-odl-ha
parameters:
_param:
linux_system_codename: xenial
- dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface}
- single_nic: ${_param:opnfv_vcp_vm_secondary_interface}
- linux:
- network:
- interface:
- single: ${_param:linux_single_interface}
opendaylight:
server:
odl_bind_ip: ${_param:single_address}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml
index 9f729f915..106aab6df 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml
@@ -8,6 +8,7 @@
---
classes:
- system.neutron.control.opendaylight.cluster
+ - cluster.baremetal-mcp-ocata-common-ha.openstack_interface_vcp_biport
- cluster.baremetal-mcp-ocata-common-ha.openstack_control
- cluster.baremetal-mcp-ocata-odl-ha.infra
parameters:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml
index f6e46d788..9fc922665 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml
@@ -7,5 +7,6 @@
##############################################################################
---
classes:
+ - cluster.baremetal-mcp-ocata-common-ha.openstack_interface_vcp_biport
- cluster.baremetal-mcp-ocata-common-ha.openstack_database
- cluster.baremetal-mcp-ocata-odl-ha
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml
index 78d6e8ec6..4cbb97513 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml
@@ -7,5 +7,6 @@
##############################################################################
---
classes:
+ - cluster.baremetal-mcp-ocata-common-ha.openstack_interface_vcp_biport
- cluster.baremetal-mcp-ocata-common-ha.openstack_message_queue
- cluster.baremetal-mcp-ocata-odl-ha
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
index 9549a63aa..c62240252 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
@@ -7,6 +7,7 @@
##############################################################################
---
classes:
+ - cluster.baremetal-mcp-ocata-common-ha.openstack_interface_vcp_triport
- cluster.baremetal-mcp-ocata-common-ha.openstack_proxy
- cluster.baremetal-mcp-ocata-odl-ha.infra
parameters:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml
index 32ebb05e9..d8f7e9739 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml
@@ -7,5 +7,6 @@
##############################################################################
---
classes:
+ - cluster.baremetal-mcp-ocata-common-ha.openstack_interface_vcp_biport
- cluster.baremetal-mcp-ocata-common-ha.openstack_telemetry
- cluster.baremetal-mcp-ocata-odl-ha.infra
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control.yml
index 9a98ba9c1..a8a3dd3f2 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control.yml
@@ -8,6 +8,7 @@
---
classes:
- system.neutron.control.openvswitch.cluster
+ - cluster.baremetal-mcp-ocata-common-ha.openstack_interface_vcp_biport
- cluster.baremetal-mcp-ocata-common-ha.openstack_control
- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
parameters:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database.yml
index fa65fbced..d1d89769e 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database.yml
@@ -7,5 +7,6 @@
##############################################################################
---
classes:
+ - cluster.baremetal-mcp-ocata-common-ha.openstack_interface_vcp_biport
- cluster.baremetal-mcp-ocata-common-ha.openstack_database
- cluster.baremetal-mcp-ocata-ovs-dpdk-ha
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/message_queue.yml
index fb3312417..40ebd160f 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/message_queue.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/message_queue.yml
@@ -7,5 +7,6 @@
##############################################################################
---
classes:
+ - cluster.baremetal-mcp-ocata-common-ha.openstack_interface_vcp_biport
- cluster.baremetal-mcp-ocata-common-ha.openstack_message_queue
- cluster.baremetal-mcp-ocata-ovs-dpdk-ha
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml
index 1fcde7ecd..4967b6476 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml
@@ -7,5 +7,6 @@
##############################################################################
---
classes:
+ - cluster.baremetal-mcp-ocata-common-ha.openstack_interface_vcp_triport
- cluster.baremetal-mcp-ocata-common-ha.openstack_proxy
- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml
index de41a81d3..183b36504 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml
@@ -7,5 +7,6 @@
##############################################################################
---
classes:
+ - cluster.baremetal-mcp-ocata-common-ha.openstack_interface_vcp_biport
- cluster.baremetal-mcp-ocata-common-ha.openstack_telemetry
- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml
index 6d120935a..de8c13f1c 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml
@@ -8,5 +8,6 @@
---
classes:
- system.neutron.control.openvswitch.cluster
+ - cluster.baremetal-mcp-ocata-common-ha.openstack_interface_vcp_biport
- cluster.baremetal-mcp-ocata-common-ha.openstack_control
- cluster.baremetal-mcp-ocata-ovs-ha.infra
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml
index 91ae84cb3..c55390ecd 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml
@@ -7,5 +7,6 @@
##############################################################################
---
classes:
+ - cluster.baremetal-mcp-ocata-common-ha.openstack_interface_vcp_biport
- cluster.baremetal-mcp-ocata-common-ha.openstack_database
- cluster.baremetal-mcp-ocata-ovs-ha
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml
index 3ce561374..089231ccc 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml
@@ -7,5 +7,6 @@
##############################################################################
---
classes:
+ - cluster.baremetal-mcp-ocata-common-ha.openstack_interface_vcp_biport
- cluster.baremetal-mcp-ocata-common-ha.openstack_message_queue
- cluster.baremetal-mcp-ocata-ovs-ha
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml
index ff6246b75..c2b0240da 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml
@@ -7,5 +7,6 @@
##############################################################################
---
classes:
+ - cluster.baremetal-mcp-ocata-common-ha.openstack_interface_vcp_triport
- cluster.baremetal-mcp-ocata-common-ha.openstack_proxy
- cluster.baremetal-mcp-ocata-ovs-ha.infra
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml
index b8e857d8d..067d63f0e 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml
@@ -7,5 +7,6 @@
##############################################################################
---
classes:
+ - cluster.baremetal-mcp-ocata-common-ha.openstack_interface_vcp_biport
- cluster.baremetal-mcp-ocata-common-ha.openstack_telemetry
- cluster.baremetal-mcp-ocata-ovs-ha.infra