summaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-09-10 02:37:11 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-09-11 16:00:55 +0200
commit0546e310ce230a46dcf3a3795c6a0baefd7aaaf2 (patch)
tree8a9b6ed5f9def89c034e12334726d346337a92ce /mcp/reclass/classes
parent97b118133edd82d2558fc169ab3974cb0b5b3946 (diff)
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>
Diffstat (limited to 'mcp/reclass/classes')
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml11
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml11
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml3
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml8
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml6
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml8
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml3
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml4
8 files changed, 40 insertions, 14 deletions
diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml
index 05aa5d237..daa89de66 100644
--- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml
+++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml
@@ -1,3 +1,14 @@
parameters:
_param:
salt_control_xenial_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-arm64-uefi1.img
+
+ # VMs spawned on Foundation Node / Jump Host net ifaces (max 4)
+ opnfv_fn_vm_primary_interface: enp1s0
+ opnfv_fn_vm_secondary_interface: enp2s0
+ opnfv_fn_vm_tertiary_interface: enp3s0
+ opnfv_fn_vm_quaternary_interface: enp4s0
+
+ # VCP VMs spawned on KVM Hosts net ifaces (max 2)
+ # NOTE(armband): Only x86 VCP VMs spawned via salt.control names differ
+ opnfv_vcp_vm_primary_interface: ${_param:opnfv_fn_vm_primary_interface}
+ opnfv_vcp_vm_secondary_interface: ${_param:opnfv_fn_vm_secondary_interface}
diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml
index 87865fd4e..669eb7dc4 100644
--- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml
+++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml
@@ -1,3 +1,14 @@
parameters:
_param:
salt_control_xenial_image: http://apt.mirantis.com/images/ubuntu-16-04-x64-latest.qcow2
+
+ # VMs spawned on Foundation Node / Jump Host net ifaces (max 4)
+ opnfv_fn_vm_primary_interface: ens3
+ opnfv_fn_vm_secondary_interface: ens4
+ opnfv_fn_vm_tertiary_interface: ens5
+ opnfv_fn_vm_quaternary_interface: ens6
+
+ # VCP VMs spawned on KVM Hosts net ifaces (max 2)
+ # NOTE(armband): Only x86 VCP VMs spawned via salt.control names differ
+ opnfv_vcp_vm_primary_interface: ens2
+ opnfv_vcp_vm_secondary_interface: ens3
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}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml
index 6bc0f510e..8f83ddee8 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml
@@ -10,8 +10,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-ovs-dpdk/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml
index 87a42105f..784011ad0 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml
@@ -7,9 +7,9 @@ parameters:
node:
openstack_compute_node01:
params:
- dpdk0_name: ens5
+ dpdk0_name: ${_param:opnfv_fn_vm_tertiary_interface}
dpdk0_pci: '"0000:00:05.0"'
openstack_compute_node02:
params:
- dpdk0_name: ens5
+ dpdk0_name: ${_param:opnfv_fn_vm_tertiary_interface}
dpdk0_pci: '"0000:00:05.0"'