From 0546e310ce230a46dcf3a3795c6a0baefd7aaaf2 Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Sun, 10 Sep 2017 02:37:11 +0200
Subject: reclass: virtual: Factor out VM interface naming

Define two groups of VM interface naming:
- ens3..ens6 - used by infra VMs, virtual node VMs;
- ens2..ens3 - used by VCP VMs (spawned by salt.control);

Parametrize newly defined interface names throughout the cluster
models.

While at it, add AArch64 default values for above iface names.

NOTE: baremetal clusters will be parametrized later, after common
config is factored out into <baremetal-mcp-ocata-common>.

Change-Id: I89aba9aaf85b585cc510302eb76d7810fbf60679
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
 .../classes/cluster/virtual-mcp-ocata-common/infra/config.yml     | 3 ++-
 .../cluster/virtual-mcp-ocata-common/openstack_compute.yml        | 8 ++++----
 .../cluster/virtual-mcp-ocata-common/openstack_control.yml        | 6 ++++--
 .../cluster/virtual-mcp-ocata-common/openstack_gateway.yml        | 8 ++++----
 4 files changed, 14 insertions(+), 11 deletions(-)

(limited to 'mcp/reclass/classes/cluster/virtual-mcp-ocata-common')

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml
index a5fc3b1d3..d60c81dd1 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml
@@ -25,8 +25,9 @@ parameters:
   linux:
     network:
       interface:
-        ens4:
+        single_int:
           enabled: true
+          name: ${_param:opnfv_fn_vm_secondary_interface}
           type: eth
           proto: static
           address: ${_param:single_address}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml
index 0cb7ccb01..2485d1ff2 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml
@@ -12,9 +12,9 @@ classes:
 - system.ceilometer.client.cinder_volume
 parameters:
   _param:
-    primary_interface: ens4
-    tenant_interface: ens5
-    external_interface: ens6
+    primary_interface: ${_param:opnfv_fn_vm_secondary_interface}
+    tenant_interface: ${_param:opnfv_fn_vm_tertiary_interface}
+    external_interface: ${_param:opnfv_fn_vm_quaternary_interface}
     interface_mtu: 9000
     linux_system_codename: xenial
     loopback_device_size: 10
@@ -50,7 +50,7 @@ parameters:
       interface:
         dhcp_int:
           enabled: true
-          name: ens3
+          name: ${_param:opnfv_fn_vm_primary_interface}
           proto: dhcp
           type: eth
           mtu: ${_param:interface_mtu}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml
index 0927900cb..5b68b7b62 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml
@@ -48,14 +48,16 @@ parameters:
           version: latest
     network:
       interface:
-        ens4:
+        single_int:
           enabled: true
+          name: ${_param:opnfv_fn_vm_secondary_interface}
           type: eth
           proto: static
           address: ${_param:single_address}
           netmask: 255.255.255.0
-        ens6:
+        public_int:
           enabled: true
+          name: ${_param:opnfv_fn_vm_quaternary_interface}
           type: eth
           proto: static
           address: ${_param:cluster_public_host}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml
index 926259023..f726c4af2 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml
@@ -4,9 +4,9 @@ classes:
 - system.linux.system.repo.saltstack.xenial
 parameters:
   _param:
-    primary_interface: ens4
-    tenant_interface: ens5
-    external_interface: ens6
+    primary_interface: ${_param:opnfv_fn_vm_secondary_interface}
+    tenant_interface: ${_param:opnfv_fn_vm_tertiary_interface}
+    external_interface: ${_param:opnfv_fn_vm_quaternary_interface}
     interface_mtu: 9000
     linux_system_codename: xenial
   neutron:
@@ -19,7 +19,7 @@ parameters:
       interface:
         dhcp_int:
           enabled: true
-          name: ens3
+          name: ${_param:opnfv_fn_vm_primary_interface}
           proto: dhcp
           type: eth
           mtu: ${_param:interface_mtu}
-- 
cgit 1.2.3-korg