summaryrefslogtreecommitdiffstats
path: root/mcp
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-09-21 01:13:16 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-09-21 19:53:36 +0200
commit9026c940be9e743eade1985e053cfaf65288e191 (patch)
treefe4c4fc9bd488de9bf444478547c6c991bcfa525 /mcp
parentdabb9c5596c3fa9dc80e12e469bd3c467c7f7663 (diff)
[maas] Override broken default main_archive URL
Upstream reclass.system introduced a regression for us in [1]. [1] https://github.com/Mirantis/reclass-system-salt-model/commit/99490e7d Change-Id: I5cedcbb5c528a8bf59b4f917b422ed433d2ceea3 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp')
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j26
1 files changed, 5 insertions, 1 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 ed9920ad6..efa04cecf 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
@@ -109,7 +109,11 @@ parameters:
{%- endif %}
salt_master_ip: ${_param:reclass_config_master}
domain: ${_param:cluster_domain}
- maas_config:
+ ~maas_config:
+ maas_name: mas01
+ active_discovery_interval: 600
+ ntp_external_only: true
+ upstream_dns: ${_param:dns_server01}
commissioning_distro_series: 'xenial'
default_distro_series: 'xenial'
default_osystem: 'ubuntu'