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=29bfa7378f06aa01f45b62ae8ddae31aebf57c48;hb=920d7ef405e9fed9af7b0576b94f6d19fe265c81;hp=c26d4a9f6f7bad3bf333b06b4cd3ddc2b94ae299;hpb=41ba73d2891f933c4d1f0e333fb9b5c7fe9c9322;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 c26d4a9f6..29bfa7378 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
@@ -10,7 +10,6 @@
 # NOTE: pod_config is generated and transferred into its final location on
 # cfg01 only during deployment to prevent leaking sensitive data
 classes:
-  - system.linux.system.single.simple
   - system.maas.region.single
   - service.maas.cluster.single
   - cluster.all-mcp-arch-common.opnfv.lab_proxy_pdf
@@ -20,20 +19,23 @@ parameters:
     mcpcontrol_interface: ${_param:opnfv_fn_vm_primary_interface}
     primary_interface: ${_param:opnfv_fn_vm_secondary_interface}
     pxe_admin_interface: ${_param:opnfv_fn_vm_tertiary_interface}
-    interface_mtu: 1500
-    # MaaS has issues using MTU > 1500 for PXE interface
-    pxe_admin_interface_mtu: 1500
     linux_system_codename: xenial
     maas_admin_username: opnfv
-    maas_admin_password: opnfv_secret
-    maas_db_password: opnfv_secret
     dns_server01: '{{ nm.dns_public[0] }}'
-    single_address: ${_param:infra_maas_node01_deploy_address}
+    pxe_admin_address: ${_param:infra_maas_node01_deploy_address}
+    single_address: ${_param:pxe_admin_address}
     hwe_kernel: 'hwe-16.04'
     opnfv_maas_timeout_comissioning: {{ nm.maas_timeout_comissioning }}
     opnfv_maas_timeout_deploying: {{ nm.maas_timeout_deploying }}
   maas:
     region:
+{%- 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"]'
+          kernel_opts: 'default_hugepagesz=1G hugepagesz=1G'
+{%- endif %}
       boot_sources_delete_all_others: true
       boot_sources:
         resources_mirror:
@@ -108,10 +110,6 @@ parameters:
     cluster:
       saltstack_repo_xenial: "deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7/ xenial main"
   linux:
-    system:
-      kernel:
-        ~boot_options:
-          - ipv6.disable=0
     network:
       interface:
         mcpcontrol_interface:
@@ -119,6 +117,7 @@ parameters:
           name: ${_param:mcpcontrol_interface}
           type: eth
           proto: dhcp
+          mtu: ${_param:interface_mtu}
         primary_interface:
           enabled: true
           name: ${_param:primary_interface}
@@ -140,7 +139,8 @@ parameters:
         pxe_admin_interface:
           enabled: true
           name: ${_param:pxe_admin_interface}
-          mtu: ${_param:pxe_admin_interface_mtu}
+          # MaaS has issues using MTU > 1500 for PXE interface
+          mtu: 1500
           proto: static
           address: ${_param:single_address}
           netmask: ${_param:opnfv_net_admin_mask}