summaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-07-09 13:25:28 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-07-09 14:29:44 +0200
commit3831d538436cbf7c033b560b76f554a1dfe28a4c (patch)
tree16717713610f1d7686c029e2a5275df4689a6990 /mcp/reclass/classes
parentb52c4df4061fd7a51aad94f144bb1326fa8a8b5a (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>
Diffstat (limited to 'mcp/reclass/classes')
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/infra/maas.yml.j226
1 files changed, 17 insertions, 9 deletions
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 81934e2d2..cdb992a06 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
@@ -52,20 +52,28 @@ parameters:
- "ga-16.04"
- "hwe-16.04"
labels: '"*"'
+ 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:
{{ nm.net_admin }}:
name: {{ nm.net_admin }}
cidr: {{ nm.net_admin }}
gateway_ip: ${_param:single_address}
- fabric: fabric-2
- iprange:
- start: {{ nm.net_admin_pool_start }}
- end: {{ nm.net_admin_pool_end }}
- type: dynamic
- vlan:
- 0:
- description: "VLAN 0"
- dhcp: true
+ fabric: ${maas:region:fabrics:pxe_admin:name}
+ vlan: 0
+ ipranges:
+ 1:
+ start: {{ nm.net_admin_pool_start }}
+ end: {{ nm.net_admin_pool_end }}
+ type: dynamic
sshprefs:
- '{{ conf.MAAS_SSH_KEY }}'
{%- if 'aarch64' in nm.cluster.arch %}