aarch64: Add kpti=off similar to x86_64 nopti

[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 6ae5b02..37bc422 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
@@ -8,7 +8,6 @@
 {%- import 'net_map.j2' as nm with context %}
 ---
 classes:
-  - system.linux.system.repo.mcp.apt_mirantis.openstack
   - service.keepalived.cluster.single
   - system.glusterfs.server.volume.glance
   - system.glusterfs.server.volume.keystone
@@ -22,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
+    linux_system_codename: bionic
     cluster_vip_address: ${_param:infra_kvm_address}
     cluster_node01_address: ${_param:infra_kvm_node01_address}
     cluster_node02_address: ${_param:infra_kvm_node02_address}
@@ -41,6 +41,7 @@ parameters:
         boot_options:
           - spectre_v2=off
           - nopti
+          - kpti=off
           - nospec_store_bypass_disable
           - noibrs
           - noibpb
@@ -53,6 +54,7 @@ parameters:
       unix_sock_group: libvirt
   salt:
     control:
+      virt_service: libvirtd
       size:  # RAM 4096,8192,16384,32768,65536
         # Default production sizing
         openstack.control:
@@ -98,8 +100,8 @@ parameters:
       cluster:
         internal:
           node:
-            mdb01: &salt_control_xenial_image_common_attr
-              image: ${_param:salt_control_xenial_image}
+            mdb01: &salt_control_bionic_image_common_attr
+              image: ${_param:salt_control_bionic_image}
 {%- if conf.nodes[nm.ctl01.idx].node.arch == 'aarch64' %}
               seed: qemu-nbd
               ~cloud_init: ~
@@ -111,31 +113,31 @@ parameters:
                 path: /usr/share/AAVMF/AAVMF_CODE.fd
 {%- endif %}
             mdb02:
-              <<: *salt_control_xenial_image_common_attr
+              <<: *salt_control_bionic_image_common_attr
             mdb03:
-              <<: *salt_control_xenial_image_common_attr
+              <<: *salt_control_bionic_image_common_attr
             ctl01:
-              <<: *salt_control_xenial_image_common_attr
+              <<: *salt_control_bionic_image_common_attr
             ctl02:
-              <<: *salt_control_xenial_image_common_attr
+              <<: *salt_control_bionic_image_common_attr
             ctl03:
-              <<: *salt_control_xenial_image_common_attr
+              <<: *salt_control_bionic_image_common_attr
             dbs01:
-              <<: *salt_control_xenial_image_common_attr
+              <<: *salt_control_bionic_image_common_attr
             dbs02:
-              <<: *salt_control_xenial_image_common_attr
+              <<: *salt_control_bionic_image_common_attr
             dbs03:
-              <<: *salt_control_xenial_image_common_attr
+              <<: *salt_control_bionic_image_common_attr
             msg01:
-              <<: *salt_control_xenial_image_common_attr
+              <<: *salt_control_bionic_image_common_attr
             msg02:
-              <<: *salt_control_xenial_image_common_attr
+              <<: *salt_control_bionic_image_common_attr
             msg03:
-              <<: *salt_control_xenial_image_common_attr
+              <<: *salt_control_bionic_image_common_attr
             prx01:
-              <<: *salt_control_xenial_image_common_attr
+              <<: *salt_control_bionic_image_common_attr
             prx02:
-              <<: *salt_control_xenial_image_common_attr
+              <<: *salt_control_bionic_image_common_attr
               provider: kvm03.${_param:cluster_domain}
   virt:
     nic: