summaryrefslogtreecommitdiffstats
path: root/mcp/reclass
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2020-01-26 16:58:13 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2020-01-28 16:07:16 +0000
commit7dffb549e8d34c53bfdd41ce28dfb33112140161 (patch)
treefa3ec045a1617c3a64d9f4e90b734fd30ae8a0f8 /mcp/reclass
parent1a62d9d38fec1d85e5c4b2c195d40d16286ad2e5 (diff)
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 <Alexandru.Avadanii@enea.com> (cherry picked from commit a3d31a425e0bcfd040746ee21063e108e4487e07)
Diffstat (limited to 'mcp/reclass')
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j24
1 files changed, 4 insertions, 0 deletions
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_<state> timeouts to ~2.5x of MaaS <state> timeout
ready: {{ nm.maas_timeout_comissioning * 150 }}