diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-07-09 16:32:16 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-07-09 16:32:58 +0200 |
| commit | af0c77ae3e7fe3b355ee0e0b08fe931d9b9af8ab (patch) | |
| tree | 9fa689f0aa53f12c4df48905f4684eb3ef4306c0 /mcp/reclass/classes/cluster | |
| parent | 56cfed1a8981a16f2671754d8aa29f7c850a0ee0 (diff) | |
[patch] MaaS: Switch to upstream fabric/vlan mgmt
Obsolete our out of tree patch in favor of upstream mechanisms for
creating fabrics/VLANs/subnets.
Change-Id: I57d6d59764a825b428f423d48c5d90af7f2e676f
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 3831d538436cbf7c033b560b76f554a1dfe28a4c)
Diffstat (limited to 'mcp/reclass/classes/cluster')
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas_pdf.yml.j2 | 26 |
1 files changed, 17 insertions, 9 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 a4e85bdde..e6c4af728 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 @@ -17,20 +17,28 @@ parameters: maas: region: + fabrics: + pxe_admin: + name: 'pxe_admin' + description: Fabric for PXE/admin + vlans: + 0: + name: 'vlan 0' + description: PXE/admin VLAN + dhcp: true + primary_rack: "${linux:network:hostname}" subnets: {{ net_admin }}: name: {{ net_admin }} cidr: {{ net_admin }} gateway_ip: ${_param:single_address} - fabric: fabric-2 - iprange: - start: ${_param:opnfv_infra_maas_pxe_start_address} - end: ${_param:opnfv_infra_maas_pxe_end_address} - type: dynamic - vlan: - 0: - description: "VLAN 0" - dhcp: true + fabric: ${maas:region:fabrics:pxe_admin:name} + vlan: 0 + ipranges: + 1: + start: ${_param:opnfv_infra_maas_pxe_start_address} + end: ${_param:opnfv_infra_maas_pxe_end_address} + type: dynamic # Space-separated list of dpkg architectures to be supported by MaaS opnfv_arches:{%- for arch in cluster_arch %} {{ arch | dpkg_arch }}{%- endfor %} sshprefs: |