From a3d31a425e0bcfd040746ee21063e108e4487e07 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sun, 26 Jan 2020 16:58:13 +0100 Subject: cfg01, mas01: Switch to Ubuntu Bionic Pin salt-formula-nfs to a commit before 'mount.opts' was introduced. Adapt salt-formula-maas bits for MaaS 2.4 (shipped by default in Bionic) compatibility. Change-Id: I42f436203d3fbdb777d6b3eff9ac185240088742 Signed-off-by: Alexandru Avadanii --- mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2 | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'mcp/reclass/classes/cluster') 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 9b799edf0..f98040b93 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 @@ -25,6 +25,9 @@ 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: @@ -32,6 +35,7 @@ parameters: definition: '//capability[@id="asimd"]|//capability[@id="cp15_barrier"]' kernel_opts: 'default_hugepagesz=1G hugepagesz=1G' {%- endif %} + enable_iframe: False timeout: # Set maas.wait_for_ timeouts to ~2.5x of MaaS timeout ready: {{ nm.maas_timeout_comissioning * 150 }} -- cgit 1.2.3-korg