cfg01, mas01: Switch to Ubuntu Bionic

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

diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2
index b5cb3fe..f98040b 100644 (file)
--- a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2
@@ -25,13 +25,17 @@ parameters:
     opnfv_maas_timeout_deploying: {{ nm.maas_timeout_deploying }}
   maas:
     region:
+      services:
+        - maas-regiond
+        - bind9
 {%- if '-ovs-' in conf.MCP_DEPLOY_SCENARIO or '-fdio-' in conf.MCP_DEPLOY_SCENARIO %}
       tags:
         aarch64_hugepages_1g:
           comment: 'Enable 1G pagesizes on aarch64'
-          definition: '//capability[@id="asimd"]'
+          definition: '//capability[@id="asimd"]|//capability[@id="cp15_barrier"]'
           kernel_opts: 'default_hugepagesz=1G hugepagesz=1G'
 {%- endif %}
+      enable_iframe: False
       timeout:
         # Set maas.wait_for_<state> timeouts to ~2.5x of MaaS <state> timeout
         ready: {{ nm.maas_timeout_comissioning * 150 }}
@@ -112,6 +116,23 @@ parameters:
       region:
         host: ${_param:single_address}
         port: 5240
+{%- if '-iec-' not in conf.MCP_DEPLOY_SCENARIO and conf.MCP_KERNEL_VER %}
+      curtin_vars:
+        amd64:
+          bionic: &curtin_vars_bionic
+            kernel_package:
+              enabled: True
+              value: 'linux-image-{{ conf.MCP_KERNEL_VER }}-generic'
+            extra_pkgs:
+              enabled: True
+              pkgs:
+                - linux-image-{{ conf.MCP_KERNEL_VER }}-generic
+                - linux-headers-{{ conf.MCP_KERNEL_VER }}-generic
+                - linux-modules-extra-{{ conf.MCP_KERNEL_VER }}-generic
+        arm64:
+          bionic:
+            <<: *curtin_vars_bionic
+{%- endif %}
   linux:
     system:
       repo:
@@ -121,12 +142,6 @@ parameters:
       ~kernel:
         sysctl:
           net.ipv4.ip_forward: 1
-    network:
-      resolv:
-        dns:
-{%- for server in nm.dns_public %}
-          - {{ server }}
-{%- endfor %}
   iptables:
     schema:
       epoch: 1