summaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/all-mcp-ocata-common
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-09-11 17:08:54 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-11 17:08:54 +0000
commitc2269d2ed4f55ec051c058dc6b733f74d0d3eec3 (patch)
treee0feffad9efc149dd1382988a5267f43c83293bd /mcp/reclass/classes/cluster/all-mcp-ocata-common
parent89bb73f0fba7d09591f52f5a513d1a846c373a8b (diff)
parent0546e310ce230a46dcf3a3795c6a0baefd7aaaf2 (diff)
Merge changes from topic 'multiarch-image-defaults'
* changes: reclass: virtual: Factor out VM interface naming reclass: Multiarch support for arch specific param
Diffstat (limited to 'mcp/reclass/classes/cluster/all-mcp-ocata-common')
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml14
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-ocata-common/init.yml2
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml14
3 files changed, 30 insertions, 0 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
new file mode 100644
index 000000000..daa89de66
--- /dev/null
+++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml
@@ -0,0 +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/init.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/init.yml
new file mode 100644
index 000000000..1139b9d72
--- /dev/null
+++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/init.yml
@@ -0,0 +1,2 @@
+classes:
+- cluster.all-mcp-ocata-common.arch
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
new file mode 100644
index 000000000..669eb7dc4
--- /dev/null
+++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml
@@ -0,0 +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