diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-05-25 17:11:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-05-25 17:11:56 +0000 |
| commit | 58615ef93be91652da9dcef3ac797d11c5cc7e88 (patch) | |
| tree | f171de33c3e4d0dcd1830a0843c02c31b54a652c /mcp/reclass/classes/cluster | |
| parent | 996a8a8518d5e3baf72b7882112f4a15c184b5eb (diff) | |
| parent | df66a22fa1007ed3f7cd3b3f0ea0a696a0d06bc3 (diff) | |
Merge "maas: boot-resources: Dynamic arch list from PDF" into stable/fraser
Diffstat (limited to 'mcp/reclass/classes/cluster')
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas_pdf.yml.j2 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas_pdf.yml.j2 index 986bb060e..1838590e9 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas_pdf.yml.j2 @@ -5,7 +5,6 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## ---- {%- set cluster_arch = [] %} {%- for node in conf.nodes %} {%- if node.node.arch not in cluster_arch %} @@ -14,6 +13,7 @@ {%- endfor %} {%- set net_admin = [conf.idf.net_config.admin.network, conf.idf.net_config.admin.mask] | join("/") %} +--- parameters: maas: region: @@ -31,6 +31,8 @@ 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 cluster_arch %} {{ arch | dpkg_arch }}{%- endfor %} sshprefs: - '{{ conf.MAAS_SSH_KEY }}' {%- if 'aarch64' in cluster_arch %} |