From 3ed2d8dab3d75628cd1f7edd47051623c643592c Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 19 Jun 2018 16:34:20 +0200 Subject: [MaaS] Adopt boot-resources control from maasng JIRA: FUEL-364 Change-Id: I891514f85cf694509003a3b0a6f3568524d0a461 Signed-off-by: Alexandru Avadanii --- .../classes/cluster/mcp-common-ha/infra/maas.yml.j2 | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'mcp/reclass/classes/cluster') diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/infra/maas.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/infra/maas.yml.j2 index 8df5ebaa1..edec24ee1 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/infra/maas.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/infra/maas.yml.j2 @@ -33,6 +33,25 @@ parameters: opnfv_maas_timeout_deploying: {{ nm.maas_timeout_deploying }} maas: region: + boot_sources_delete_all_others: true + boot_sources: + resources_mirror: + url: http://images.maas.io/ephemeral-v3/daily + keyring_file: /usr/share/keyrings/ubuntu-cloudimage-keyring.gpg + boot_sources_selections: + xenial: + url: "http://images.maas.io/ephemeral-v3/daily" + os: "ubuntu" + release: "${_param:linux_system_codename}" + arches: +{%- for arch in nm.cluster.arch %} + - "{{ arch | dpkg_arch }}" +{%- endfor %} + subarches: + - "generic" + - "ga-16.04" + - "hwe-16.04" + labels: '"*"' subnets: {{ nm.net_admin }}: name: {{ nm.net_admin }} @@ -47,8 +66,6 @@ parameters: vid: 0 dhcp_on: true primary_rack: ${_param:infra_maas_node01_hostname} - # Space-separated list of dpkg architectures to be supported by MaaS - opnfv_arches:{%- for arch in nm.cluster.arch %} {{ arch | dpkg_arch }}{%- endfor %} sshprefs: - '{{ conf.MAAS_SSH_KEY }}' {%- if 'aarch64' in nm.cluster.arch %} -- cgit 1.2.3-korg