From 97b118133edd82d2558fc169ab3974cb0b5b3946 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sun, 10 Sep 2017 01:52:18 +0200 Subject: reclass: Multiarch support for arch specific param Introduce a simple mechanism that simulates an 'if-arch-then' cond for reclass models: - add new class hierarchy; - at runtime (via ) make 'all-mcp-ocata-common.arch' point to 'all-mcp-ocata-common.$(uname -i)' dynamically; - inherit new 'arch' class in all cluster models; - factor out current x86_64 default for "salt_control_xenial_image"; - add AArch64 default for param "salt_control_xenial_image"; Change-Id: I3b239b28d0fd1cc2ced8579e2e93b764eb71ffc3 Signed-off-by: Alexandru Avadanii --- mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml (limited to 'mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64') 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 new file mode 100644 index 000000000..05aa5d237 --- /dev/null +++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml @@ -0,0 +1,3 @@ +parameters: + _param: + salt_control_xenial_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-arm64-uefi1.img -- cgit From 0546e310ce230a46dcf3a3795c6a0baefd7aaaf2 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii 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 . Change-Id: I89aba9aaf85b585cc510302eb76d7810fbf60679 Signed-off-by: Alexandru Avadanii --- .../classes/cluster/all-mcp-ocata-common/aarch64/init.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64') 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} -- cgit