cfg01, mas01: Switch to Ubuntu Bionic

[fuel.git] / mcp / reclass / classes / cluster / all-mcp-arch-common / init.yml.j2

diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2
index 0f3cab9..fc5bbaa 100644 (file)
--- a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2
@@ -7,40 +7,27 @@
 ##############################################################################
 ---
 classes:
+  - system.defaults
   - system.linux.system.single
   - cluster.all-mcp-arch-common.opnfv
   - cluster.all-mcp-arch-common.passwords
 parameters:
   _param:
-    openstack_version: rocky
-    armband_repo_version: ${_param:openstack_version}
-    apt_mk_version: nightly
-    mcp_repo_version: 1.1
+    openstack_version: stein
+    armband_repo_version: rocky
+    mcp_version: nightly
 
     banner_company_name: OPNFV
 
     salt_control_trusty_image: ''  # Dummy value, to keep reclass 1.5.2 happy
-    salt_control_xenial_image: salt://salt/files/control/images/base_image_opnfv_fuel_vcp.img
+    salt_control_bionic_image: salt://salt/files/control/images/base_image_opnfv_fuel_vcp.img
 
-    # VMs spawned on Foundation Node / Jump Host net ifaces (max 4)
     # VCP VMs spawned on KVM Hosts net ifaces (max 3)
-    # NOTE(armband): Only x86 VCP VMs spawned via salt.control names differ
-
 {%- if conf.MCP_JUMP_ARCH == 'aarch64' %}
-    opnfv_fn_vm_primary_interface: enp1s0
-    opnfv_fn_vm_secondary_interface: enp2s0
-    opnfv_fn_vm_tertiary_interface: enp3s0
-    opnfv_fn_vm_quaternary_interface: enp4s0
-
-    opnfv_vcp_vm_primary_interface: ${_param:opnfv_fn_vm_primary_interface}
-    opnfv_vcp_vm_secondary_interface: ${_param:opnfv_fn_vm_secondary_interface}
-    opnfv_vcp_vm_tertiary_interface: ${_param:opnfv_fn_vm_tertiary_interface}
+    opnfv_vcp_vm_primary_interface: enp1s0
+    opnfv_vcp_vm_secondary_interface: enp2s0
+    opnfv_vcp_vm_tertiary_interface: enp3s0
 {%- else %}
-    opnfv_fn_vm_primary_interface: ens3
-    opnfv_fn_vm_secondary_interface: ens4
-    opnfv_fn_vm_tertiary_interface: ens5
-    opnfv_fn_vm_quaternary_interface: ens6
-
     opnfv_vcp_vm_primary_interface: ens2
     opnfv_vcp_vm_secondary_interface: ens3
     opnfv_vcp_vm_tertiary_interface: ens4