From 5ab45d25c8fd3e5528c411e09b105699c745457f Mon Sep 17 00:00:00 2001
From: Guillermo Herrero <guillermo.herrero@enea.com>
Date: Tue, 3 Oct 2017 10:30:47 +0200
Subject: Parametrized network config: nic device names

Change-Id: I94d40529261f7753ec47a0c6a8c67ecc0fb15951
Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
---
 .../classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml   | 6 ++++--
 .../classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml     | 4 ++++
 .../classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml      | 8 ++++----
 .../classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml     | 6 +++---
 4 files changed, 15 insertions(+), 9 deletions(-)

(limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra')

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 15202f11b..2e3e9d124 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
@@ -31,11 +31,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-odl-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml
index 236d521d0..a84911661 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-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-odl-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
index 67a2c4da5..c13c47514 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,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
@@ -115,10 +115,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:
@@ -140,7 +140,7 @@ parameters:
   linux:
     network:
       interface:
-        eth3:
+        deploy:
           enabled: true
           type: eth
           proto: manual
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 2e39588f4..40e23eb8c 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: ${_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
-- 
cgit 1.2.3-korg