Merge "Parametrized network config: nic device names"

12 files changed, 40 insertions, 31 deletions

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 3966dae6c..98443d97b 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
@@ -30,11 +30,13 @@ parameters:
     salt_master_host: ${_param:infra_config_deploy_address}
     # yamllint disable rule:line-length
     salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
+    dhcp_nic: ${_param:infra_secondary_nic}
+    single_nic: ${_param:infra_tertiary_nic}
   linux:
     network:
       interface:
-        ens3: ${_param:linux_dhcp_interface}
-        ens4: ${_param:linux_single_interface}
+        dhcp: ${_param:linux_dhcp_interface}
+        single: ${_param:linux_single_interface}
   salt:
     master:
       accept_policy: open_mode
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
index d6c3e6cb1..37983049d 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
@@ -45,14 +45,18 @@ parameters:
       storage:
         node:
           name: default
+    dhcp_nic: ${_param:infra_primary_nic}
+    single_nic: ${_param:infra_secondary_nic}
     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
 
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 aa3cb4f2a..63fdd7a71 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,7 @@ 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: ${_param:openstack_primary_nic}
   salt:
     control:
       size:  # RAM 4096,8192,16384,32768,65536
@@ -105,10 +105,10 @@ parameters:
   virt:
     nic:
       default:
-        eth1:
+        - name: ${_param:deploy_nic}
           bridge: br-mgmt
           model: virtio
-        eth0:
+        - name: ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}
           bridge: br-ctl
           model: virtio
   glusterfs:
@@ -130,7 +130,7 @@ parameters:
   linux:
     network:
       interface:
-        eth3:
+        deploy:
           enabled: true
           type: eth
           proto: manual
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 c0a487417..7a9172329 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: ${_param:infra_primary_nic}
+    primary_interface: ${_param:infra_secondary_nic}
+    pxe_interface: ${_param:infra_tertiary_nic}
     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/benchmark.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/benchmark.yml
index 23a8d46f3..d70f3ed0e 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/benchmark.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/benchmark.yml
@@ -2,8 +2,11 @@
 classes:
   - cluster.baremetal-mcp-ocata-ovs-ha
 parameters:
+  _param:
+      dhcp_nic: eth0
+      single_nic: eth1
   linux:
     network:
       interface:
-        eth0: ${_param:linux_dhcp_interface}
-        eth1: ${_param:linux_single_interface}
+        dhcp: ${_param:linux_dhcp_interface}
+        single: ${_param:linux_single_interface}
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 a6fd289f5..422f65da8 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,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
-    external_nic: enp8s0
+    mgmt_nic: ${_param:openstack_primary_nic}
+    tenant_nic: ${_param:openstack_secondary_nic}
+    external_nic: ${_param:openstack_tertiary_nic}
     linux_system_codename: xenial
     interface_mtu: 1500
     keepalived_vip_interface: br-ctl
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 5d796eb82..3fd4fd185 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: ${_param:single_nic}
     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}
+        dhcp: ${_param:linux_dhcp_interface}
+        single: ${_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 f2e010da4..03635ca68 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}
+        dhcp: ${_param:linux_dhcp_interface}
+        single: ${_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 7346f5545..e2ee1a89c 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: ${_param:single_nic}
     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}
+        dhcp: ${_param:linux_dhcp_interface}
+        single: ${_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 083cf7566..67a5d3d5a 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: ${_param:single_nic}
     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}
+        dhcp: ${_param:linux_dhcp_interface}
+        single: ${_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 6e0479355..c6a68fa29 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: ${_param:single_nic}
     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}
+        dhcp: ${_param:linux_dhcp_interface}
+        single: ${_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 8254d97af..4a72a61e6 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: ${_param:single_nic}
     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}
+        dhcp: ${_param:linux_dhcp_interface}
+        single: ${_param:linux_single_interface}
   mongodb:
     server:
       logging: