Merge "[virtual] Parameterize scenarios based on PDF/IDF"

[fuel.git] / mcp / reclass / classes / cluster / mcp-common-ha / infra / kvm.yml.j2

diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml.j2
index 62af089..822e8bf 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml.j2
@@ -5,9 +5,9 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
+{%- import 'net_map.j2' as nm with context %}
 ---
 classes:
-  - system.linux.system.repo.glusterfs
   - service.keepalived.cluster.single
   - system.glusterfs.server.volume.glance
   - system.glusterfs.server.volume.keystone
@@ -21,13 +21,14 @@ classes:
   # - system.salt.control.cluster.stacklight_server_cluster
   # - system.salt.control.cluster.stacklight_log_cluster
   # - system.salt.control.cluster.stacklight_telemetry_cluster
+  - cluster.all-mcp-arch-common.backports
+  - cluster.mcp-common-ha.glusterfs_repo
   - cluster.mcp-common-ha.infra.kvm_pdf
   - cluster.all-mcp-arch-common.opnfv.maas_proxy
   - cluster.all-mcp-arch-common.opnfv.lab_proxy_pdf
 parameters:
   _param:
     linux_system_codename: xenial
-    glusterfs_version: '3.13'
     cluster_vip_address: ${_param:infra_kvm_address}
     cluster_node01_address: ${_param:infra_kvm_node01_address}
     cluster_node02_address: ${_param:infra_kvm_node02_address}
@@ -40,6 +41,11 @@ parameters:
         boot_options:
           - spectre_v2=off
           - nopti
+          - nospec_store_bypass_disable
+          - noibrs
+          - noibpb
+        sysctl:
+          net.ipv4.ip_forward: 0
   libvirt:
     server:
       service: libvirtd
@@ -92,34 +98,44 @@ parameters:
       cluster:
         internal:
           node:
-            mdb01:
+            mdb01: &salt_control_xenial_image_common_attr
               image: ${_param:salt_control_xenial_image}
+{%- if conf.nodes[nm.ctl01.idx].node.arch == 'aarch64' %}
+              seed: qemu-nbd
+              ~cloud_init: ~
+              machine: virt
+              cpu_mode: host-passthrough
+              loader:
+                readonly: 'yes'
+                type: pflash
+                path: /usr/share/AAVMF/AAVMF_CODE.fd
+{%- endif %}
             mdb02:
-              image: ${_param:salt_control_xenial_image}
+              <<: *salt_control_xenial_image_common_attr
             mdb03:
-              image: ${_param:salt_control_xenial_image}
+              <<: *salt_control_xenial_image_common_attr
             ctl01:
-              image: ${_param:salt_control_xenial_image}
+              <<: *salt_control_xenial_image_common_attr
             ctl02:
-              image: ${_param:salt_control_xenial_image}
+              <<: *salt_control_xenial_image_common_attr
             ctl03:
-              image: ${_param:salt_control_xenial_image}
+              <<: *salt_control_xenial_image_common_attr
             dbs01:
-              image: ${_param:salt_control_xenial_image}
+              <<: *salt_control_xenial_image_common_attr
             dbs02:
-              image: ${_param:salt_control_xenial_image}
+              <<: *salt_control_xenial_image_common_attr
             dbs03:
-              image: ${_param:salt_control_xenial_image}
+              <<: *salt_control_xenial_image_common_attr
             msg01:
-              image: ${_param:salt_control_xenial_image}
+              <<: *salt_control_xenial_image_common_attr
             msg02:
-              image: ${_param:salt_control_xenial_image}
+              <<: *salt_control_xenial_image_common_attr
             msg03:
-              image: ${_param:salt_control_xenial_image}
+              <<: *salt_control_xenial_image_common_attr
             prx01:
-              image: ${_param:salt_control_xenial_image}
+              <<: *salt_control_xenial_image_common_attr
             prx02:
-              image: ${_param:salt_control_xenial_image}
+              <<: *salt_control_xenial_image_common_attr
               provider: kvm03.${_param:cluster_domain}
   virt:
     nic: