X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=mcp%2Freclass%2Fclasses%2Fcluster%2Fall-mcp-arch-common%2Finfra%2Fmaas.yml.j2;h=57da919de119689aa88435b6382566f1a5ed70ec;hb=4deaa15d1e8a9e0e7e0bfb26d4cf3c1b2450c1a1;hp=b5cb3fece181c101bc63a44111cad61942d8af47;hpb=fab511daabb05c493943b5f7a2ea8b5fe0802e2d;p=fuel.git 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 b5cb3fece..57da919de 100644 --- 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 @@ -20,7 +20,7 @@ parameters: maas_admin_username: opnfv dns_server01: '{{ nm.dns_public[0] }}' single_address: ${_param:infra_maas_node01_deploy_address} - hwe_kernel: 'ga-18.04' + hwe_kernel: 'hwe-18.04' opnfv_maas_timeout_comissioning: {{ nm.maas_timeout_comissioning }} opnfv_maas_timeout_deploying: {{ nm.maas_timeout_deploying }} maas: @@ -29,7 +29,7 @@ parameters: 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 %} timeout: @@ -54,6 +54,7 @@ parameters: subarches: - "generic" - "ga-18.04" + - "hwe-18.04" labels: '"*"' fabrics: pxe_admin: @@ -121,12 +122,6 @@ parameters: ~kernel: sysctl: net.ipv4.ip_forward: 1 - network: - resolv: - dns: -{%- for server in nm.dns_public %} - - {{ server }} -{%- endfor %} iptables: schema: epoch: 1