diff options
Diffstat (limited to 'patches/opnfv-fuel/0004-classes-baremetal-AArch64-virtio-NIC-names-sync.patch')
| -rw-r--r-- | patches/opnfv-fuel/0004-classes-baremetal-AArch64-virtio-NIC-names-sync.patch | 605 |
1 files changed, 0 insertions, 605 deletions
diff --git a/patches/opnfv-fuel/0004-classes-baremetal-AArch64-virtio-NIC-names-sync.patch b/patches/opnfv-fuel/0004-classes-baremetal-AArch64-virtio-NIC-names-sync.patch deleted file mode 100644 index 49946eff..00000000 --- a/patches/opnfv-fuel/0004-classes-baremetal-AArch64-virtio-NIC-names-sync.patch +++ /dev/null @@ -1,605 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2017 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 -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> -Date: Sun, 6 Aug 2017 20:42:47 +0200 -Subject: [PATCH] classes: baremetal: AArch64: virtio NIC names sync - -grep -e "ens[[:digit:]]" -R . -l | \ - xargs sed -i \ - -e 's/ens3/enp1s0/g' \ - -e 's/ens4/enp2s0/g' \ - -e 's/ens5/enp3s0/g' \ - -e 's/ens6/enp4s0/g' - -Since AArch64 will be using virtio-net-pci NIC model for guests, -predictable interface naming yields a slightly different scheme. - -Update all configuration to reflect this. - -NOTE: Above configuration is expected with libvirt 3.x, which puts -each NIC on a separate PCIe bus (which also imposes virtio modern -is used). - -Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> ---- - .../baremetal-mcp-ocata-odl-ha/infra/config.yml | 4 ++-- - .../cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml | 16 +++++++++++----- - .../cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml | 6 +++--- - .../opendaylight/control.yml | 2 +- - .../baremetal-mcp-ocata-odl-ha/openstack/compute.yml | 19 ++++++------------- - .../baremetal-mcp-ocata-odl-ha/openstack/control.yml | 6 +++--- - .../openstack/dashboard.yml | 4 ++-- - .../baremetal-mcp-ocata-odl-ha/openstack/database.yml | 6 +++--- - .../openstack/message_queue.yml | 6 +++--- - .../baremetal-mcp-ocata-odl-ha/openstack/proxy.yml | 6 +++--- - .../openstack/telemetry.yml | 6 +++--- - .../baremetal-mcp-ocata-ovs-ha/infra/config.yml | 4 ++-- - .../cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml | 16 +++++++++++----- - .../cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml | 6 +++--- - .../baremetal-mcp-ocata-ovs-ha/openstack/compute.yml | 19 ++++++------------- - .../baremetal-mcp-ocata-ovs-ha/openstack/control.yml | 6 +++--- - .../openstack/dashboard.yml | 4 ++-- - .../baremetal-mcp-ocata-ovs-ha/openstack/database.yml | 6 +++--- - .../openstack/message_queue.yml | 6 +++--- - .../baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml | 6 +++--- - .../openstack/telemetry.yml | 6 +++--- - 21 files changed, 79 insertions(+), 81 deletions(-) - -diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml -index 15202f1..6ddb8a2 100644 ---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml -+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml -@@ -34,8 +34,8 @@ parameters: - linux: - network: - interface: -- ens3: ${_param:linux_dhcp_interface} -- ens4: ${_param:linux_single_interface} -+ enp1s0: ${_param:linux_dhcp_interface} -+ enp2s0: ${_param:linux_single_interface} - salt: - master: - accept_policy: open_mode -diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml -index 67a2c4d..331a262 100644 ---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml -+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml -@@ -25,7 +25,8 @@ parameters: - cluster_node03_address: ${_param:infra_kvm_node03_address} - keepalived_vip_interface: br-ctl - keepalived_vip_virtual_router_id: 69 -- deploy_nic: enp6s0 -+ deploy_nic: eth0 -+ trunk_nic: eth1 - salt: - control: - size: # RAM 4096,8192,16384,32768,65536 -@@ -140,7 +141,7 @@ parameters: - linux: - network: - interface: -- eth3: -+ eth0: - enabled: true - type: eth - proto: manual -@@ -148,6 +149,11 @@ parameters: - netmask: 255.255.255.0 - name: ${_param:deploy_nic} - noifupdown: true -+ eth1: -+ enabled: true -+ type: eth -+ proto: manual -+ name: ${_param:trunk_nic} - br-mgmt: - enabled: true - proto: dhcp -@@ -160,9 +166,9 @@ parameters: - enabled: true - proto: manual - type: vlan -- name: ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan} -+ name: ${_param:trunk_nic}.${_param:opnfv_net_mgmt_vlan} - use_interfaces: -- - ${_param:deploy_nic} -+ - ${_param:trunk_nic} - br-ctl: - enabled: true - type: bridge -@@ -170,4 +176,4 @@ parameters: - address: ${_param:single_address} - netmask: 255.255.255.0 - use_interfaces: -- - ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan} -+ - ${_param:trunk_nic}.${_param:opnfv_net_mgmt_vlan} -diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml -index 2e39588..e5c6573 100644 ---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml -+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml -@@ -5,9 +5,9 @@ classes: - - cluster.baremetal-mcp-ocata-odl-ha.infra - parameters: - _param: -- dhcp_interface: ens3 -- primary_interface: ens4 -- pxe_interface: ens5 -+ dhcp_interface: enp1s0 -+ primary_interface: enp2s0 -+ pxe_interface: enp3s0 - interface_mtu: 1500 - # MaaS has issues using MTU > 1500 for PXE interface - pxe_interface_mtu: 1500 -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 ec25ad1..f00a775 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,7 +10,7 @@ parameters: - linux: - network: - interface: -- ens3: -+ enp2s0: - enabled: true - type: eth - proto: static -diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml -index f2dab39..e2179ee 100644 ---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml -+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml -@@ -24,10 +24,9 @@ parameters: - cluster_node03_hostname: ctl03 - cluster_node03_address: ${_param:openstack_control_node03_address} - nova_vncproxy_url: https://${_param:cluster_public_host}:6080 -- mgmt_nic: enp6s0 -- tenant_nic: enp7s0 -+ mgmt_nic: eth0 -+ tenant_nic: eth1 - linux_system_codename: xenial -- external_nic: enp8s0 - interface_mtu: 1500 - keepalived_vip_interface: br-ctl - keepalived_vip_virtual_router_id: 69 -@@ -77,12 +76,6 @@ parameters: - type: eth - proto: manual - name: ${_param:tenant_nic} -- external_nic: -- enabled: true -- name: ${_param:external_nic} -- mtu: ${_param:interface_mtu} -- proto: manual -- type: eth - br-mesh: - enabled: true - type: bridge -@@ -95,9 +88,9 @@ parameters: - enabled: true - proto: manual - type: vlan -- name: ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan} -+ name: ${_param:tenant_nic}.${_param:opnfv_net_mgmt_vlan} - use_interfaces: -- - ${_param:mgmt_nic} -+ - ${_param:tenant_nic} - tenant-vlan: - enabled: true - proto: manual -@@ -112,7 +105,7 @@ parameters: - address: ${_param:single_address} - netmask: 255.255.255.0 - use_interfaces: -- - ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan} -+ - ${_param:tenant_nic}.${_param:opnfv_net_mgmt_vlan} - br-floating: - enabled: true - type: ovs_bridge -@@ -129,6 +122,6 @@ parameters: - address: ${_param:external_address} - netmask: 255.255.255.0 - use_interfaces: -- - ${_param:external_nic} -+ - ${_param:tenant_nic} - use_ovs_ports: - - float-to-ex -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 b04513f..535de37 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 -@@ -23,7 +23,7 @@ classes: - - cluster.baremetal-mcp-ocata-odl-ha.infra - parameters: - _param: -- keepalived_vip_interface: ens3 -+ keepalived_vip_interface: enp2s0 - keepalived_vip_virtual_router_id: 50 - cluster_vip_address: ${_param:openstack_control_address} - cluster_local_address: ${_param:single_address} -@@ -37,8 +37,8 @@ parameters: - linux: - network: - interface: -- ens2: ${_param:linux_dhcp_interface} -- ens3: ${_param:linux_single_interface} -+ enp1s0: ${_param:linux_dhcp_interface} -+ enp2s0: ${_param:linux_single_interface} - keystone: - server: - cacert: /etc/ssl/certs/mcp_os_cacert -diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml -index ddcc196..2f56b5a 100644 ---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml -+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml -@@ -8,5 +8,5 @@ parameters: - linux: - network: - interface: -- ens2: ${_param:linux_dhcp_interface} -- ens3: ${_param:linux_single_interface} -+ enp1s0: ${_param:linux_dhcp_interface} -+ enp2s0: ${_param:linux_single_interface} -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 12fbe91..7e0fd6c 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 -@@ -16,7 +16,7 @@ classes: - - cluster.baremetal-mcp-ocata-odl-ha - parameters: - _param: -- keepalived_vip_interface: ens3 -+ keepalived_vip_interface: enp2s0 - keepalived_vip_virtual_router_id: 80 - galera_server_cluster_name: openstack_cluster - galera_max_connections: 3072 -@@ -32,5 +32,5 @@ parameters: - linux: - network: - interface: -- ens2: ${_param:linux_dhcp_interface} -- ens3: ${_param:linux_single_interface} -+ enp1s0: ${_param:linux_dhcp_interface} -+ enp2s0: ${_param:linux_single_interface} -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 4bbd92f..25c99da 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,7 +7,7 @@ classes: - - cluster.baremetal-mcp-ocata-odl-ha - parameters: - _param: -- keepalived_vip_interface: ens3 -+ keepalived_vip_interface: enp2s0 - keepalived_vip_virtual_router_id: 90 - cluster_vip_address: ${_param:openstack_message_queue_address} - cluster_local_address: ${_param:single_address} -@@ -20,5 +20,5 @@ parameters: - linux: - network: - interface: -- ens2: ${_param:linux_dhcp_interface} -- ens3: ${_param:linux_single_interface} -+ enp1s0: ${_param:linux_dhcp_interface} -+ enp2s0: ${_param:linux_single_interface} -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 b8d7109..c3ae104 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 -@@ -17,7 +17,7 @@ classes: - # - cluster.baremetal-mcp-ocata-odl-ha.stacklight.proxy - parameters: - _param: -- keepalived_vip_interface: ens3 -+ keepalived_vip_interface: enp2s0 - keepalived_vip_virtual_router_id: 240 - nginx_proxy_ssl: - enabled: true -@@ -29,8 +29,8 @@ parameters: - linux: - network: - interface: -- ens2: ${_param:linux_dhcp_interface} -- ens3: ${_param:linux_single_interface} -+ enp1s0: ${_param:linux_dhcp_interface} -+ enp2s0: ${_param:linux_single_interface} - system: - package: - libapache2-mod-wsgi: -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 8c4d65a..a6a6fde 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 -@@ -12,7 +12,7 @@ classes: - - cluster.baremetal-mcp-ocata-odl-ha.infra - parameters: - _param: -- keepalived_openstack_telemetry_vip_interface: ens3 -+ keepalived_openstack_telemetry_vip_interface: enp2s0 - keepalived_vip_virtual_router_id: 230 - cluster_vip_address: ${_param:openstack_telemetry_address} - cluster_local_address: ${_param:single_address} -@@ -25,8 +25,8 @@ parameters: - linux: - network: - interface: -- ens2: ${_param:linux_dhcp_interface} -- ens3: ${_param:linux_single_interface} -+ enp1s0: ${_param:linux_dhcp_interface} -+ enp2s0: ${_param:linux_single_interface} - mongodb: - server: - logging: -diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml -index 3966dae..7fd1716 100644 ---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml -+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml -@@ -33,8 +33,8 @@ parameters: - linux: - network: - interface: -- ens3: ${_param:linux_dhcp_interface} -- ens4: ${_param:linux_single_interface} -+ enp1s0: ${_param:linux_dhcp_interface} -+ enp2s0: ${_param:linux_single_interface} - salt: - master: - accept_policy: open_mode -diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml -index aa3cb4f..163cf5f 100644 ---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml -+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml -@@ -25,7 +25,8 @@ parameters: - cluster_node03_address: ${_param:infra_kvm_node03_address} - keepalived_vip_interface: br-ctl - keepalived_vip_virtual_router_id: 69 -- deploy_nic: enp6s0 -+ deploy_nic: eth0 -+ trunk_nic: eth1 - salt: - control: - size: # RAM 4096,8192,16384,32768,65536 -@@ -130,7 +131,7 @@ parameters: - linux: - network: - interface: -- eth3: -+ eth0: - enabled: true - type: eth - proto: manual -@@ -138,6 +139,11 @@ parameters: - netmask: 255.255.255.0 - name: ${_param:deploy_nic} - noifupdown: true -+ eth1: -+ enabled: true -+ type: eth -+ proto: manual -+ name: ${_param:trunk_nic} - br-mgmt: - enabled: true - proto: dhcp -@@ -150,9 +156,9 @@ parameters: - enabled: true - proto: manual - type: vlan -- name: ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan} -+ name: ${_param:trunk_nic}.${_param:opnfv_net_mgmt_vlan} - use_interfaces: -- - ${_param:deploy_nic} -+ - ${_param:trunk_nic} - br-ctl: - enabled: true - type: bridge -@@ -160,4 +166,4 @@ parameters: - address: ${_param:single_address} - netmask: 255.255.255.0 - use_interfaces: -- - ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan} -+ - ${_param:trunk_nic}.${_param:opnfv_net_mgmt_vlan} -diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml -index c0a4874..dffcad6 100644 ---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml -+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml -@@ -5,9 +5,9 @@ classes: - - cluster.baremetal-mcp-ocata-ovs-ha.infra - parameters: - _param: -- dhcp_interface: ens3 -- primary_interface: ens4 -- pxe_interface: ens5 -+ dhcp_interface: enp1s0 -+ primary_interface: enp2s0 -+ pxe_interface: enp3s0 - interface_mtu: 1500 - # MaaS has issues using MTU > 1500 for PXE interface - pxe_interface_mtu: 1500 -diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml -index a6fd289..36465cd 100644 ---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml -+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml -@@ -23,9 +23,8 @@ parameters: - cluster_node03_hostname: ctl03 - cluster_node03_address: ${_param:openstack_control_node03_address} - nova_vncproxy_url: https://${_param:cluster_public_host}:6080 -- mgmt_nic: enp6s0 -- tenant_nic: enp7s0 -- external_nic: enp8s0 -+ mgmt_nic: eth0 -+ tenant_nic: eth1 - linux_system_codename: xenial - interface_mtu: 1500 - keepalived_vip_interface: br-ctl -@@ -60,12 +59,6 @@ parameters: - type: eth - proto: manual - name: ${_param:tenant_nic} -- external_nic: -- enabled: true -- name: ${_param:external_nic} -- mtu: ${_param:interface_mtu} -- proto: manual -- type: eth - br-mesh: - enabled: true - type: bridge -@@ -78,9 +71,9 @@ parameters: - enabled: true - proto: manual - type: vlan -- name: ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan} -+ name: ${_param:tenant_nic}.${_param:opnfv_net_mgmt_vlan} - use_interfaces: -- - ${_param:mgmt_nic} -+ - ${_param:tenant_nic} - tenant-vlan: - enabled: true - proto: manual -@@ -95,7 +88,7 @@ parameters: - address: ${_param:single_address} - netmask: 255.255.255.0 - use_interfaces: -- - ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan} -+ - ${_param:tenant_nic}.${_param:opnfv_net_mgmt_vlan} - br-floating: - enabled: true - type: ovs_bridge -@@ -112,6 +105,6 @@ parameters: - address: ${_param:external_address} - netmask: 255.255.255.0 - use_interfaces: -- - ${_param:external_nic} -+ - ${_param:tenant_nic} - use_ovs_ports: - - float-to-ex -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 5d796eb..ec0f83a 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 -@@ -23,7 +23,7 @@ classes: - - cluster.baremetal-mcp-ocata-ovs-ha.infra - parameters: - _param: -- keepalived_vip_interface: ens3 -+ keepalived_vip_interface: enp2s0 - keepalived_vip_virtual_router_id: 50 - cluster_vip_address: ${_param:openstack_control_address} - cluster_local_address: ${_param:single_address} -@@ -37,8 +37,8 @@ parameters: - linux: - network: - interface: -- ens2: ${_param:linux_dhcp_interface} -- ens3: ${_param:linux_single_interface} -+ enp1s0: ${_param:linux_dhcp_interface} -+ enp2s0: ${_param:linux_single_interface} - keystone: - server: - cacert: /etc/ssl/certs/mcp_os_cacert -diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml -index f2e010d..160d69c 100644 ---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml -+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml -@@ -8,5 +8,5 @@ parameters: - linux: - network: - interface: -- ens2: ${_param:linux_dhcp_interface} -- ens3: ${_param:linux_single_interface} -+ enp1s0: ${_param:linux_dhcp_interface} -+ enp2s0: ${_param:linux_single_interface} -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 7346f55..561e945 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 -@@ -16,7 +16,7 @@ classes: - - cluster.baremetal-mcp-ocata-ovs-ha - parameters: - _param: -- keepalived_vip_interface: ens3 -+ keepalived_vip_interface: enp2s0 - keepalived_vip_virtual_router_id: 80 - galera_server_cluster_name: openstack_cluster - galera_max_connections: 3072 -@@ -32,5 +32,5 @@ parameters: - linux: - network: - interface: -- ens2: ${_param:linux_dhcp_interface} -- ens3: ${_param:linux_single_interface} -+ enp1s0: ${_param:linux_dhcp_interface} -+ enp2s0: ${_param:linux_single_interface} -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 083cf75..d5f5973 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,7 +7,7 @@ classes: - - cluster.baremetal-mcp-ocata-ovs-ha - parameters: - _param: -- keepalived_vip_interface: ens3 -+ keepalived_vip_interface: enp2s0 - keepalived_vip_virtual_router_id: 90 - cluster_vip_address: ${_param:openstack_message_queue_address} - cluster_local_address: ${_param:single_address} -@@ -20,5 +20,5 @@ parameters: - linux: - network: - interface: -- ens2: ${_param:linux_dhcp_interface} -- ens3: ${_param:linux_single_interface} -+ enp1s0: ${_param:linux_dhcp_interface} -+ enp2s0: ${_param:linux_single_interface} -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 6e04793..c23331a 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 -@@ -17,7 +17,7 @@ classes: - # - cluster.baremetal-mcp-ocata-ovs-ha.stacklight.proxy - parameters: - _param: -- keepalived_vip_interface: ens3 -+ keepalived_vip_interface: enp2s0 - keepalived_vip_virtual_router_id: 240 - nginx_proxy_ssl: - enabled: true -@@ -29,8 +29,8 @@ parameters: - linux: - network: - interface: -- ens2: ${_param:linux_dhcp_interface} -- ens3: ${_param:linux_single_interface} -+ enp1s0: ${_param:linux_dhcp_interface} -+ enp2s0: ${_param:linux_single_interface} - system: - package: - libapache2-mod-wsgi: -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 8254d97..61136bb 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 -@@ -12,7 +12,7 @@ classes: - - cluster.baremetal-mcp-ocata-ovs-ha.infra - parameters: - _param: -- keepalived_openstack_telemetry_vip_interface: ens3 -+ keepalived_openstack_telemetry_vip_interface: enp2s0 - keepalived_vip_virtual_router_id: 230 - cluster_vip_address: ${_param:openstack_telemetry_address} - cluster_local_address: ${_param:single_address} -@@ -25,8 +25,8 @@ parameters: - linux: - network: - interface: -- ens2: ${_param:linux_dhcp_interface} -- ens3: ${_param:linux_single_interface} -+ enp1s0: ${_param:linux_dhcp_interface} -+ enp2s0: ${_param:linux_single_interface} - mongodb: - server: - logging: |