From 44497faea2b2eda0d42c8f95bd3883f68f5f35b8 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Fri, 21 Sep 2018 01:13:16 +0200 Subject: [PATCH] [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 --- mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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' -- 2.16.6