diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-06-26 10:33:08 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-06-26 10:33:08 +0000 |
| commit | 8329a68c3cd49db8a31ef16f592b6efffc038958 (patch) | |
| tree | ff4a72285a29210a0acaeeaf232da00423236c91 /mcp/reclass/classes/cluster/mcp-common-ha/infra | |
| parent | c875da0f72a06e05bdf76f1f2ab9e1a7136b8ae3 (diff) | |
| parent | 75cbbc689bd9428384f4828f970981da52e92a04 (diff) | |
Merge "[ha] Add fabric to maas admin subnet"
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-common-ha/infra')
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-common-ha/infra/maas.yml.j2 | 13 |
1 files changed, 8 insertions, 5 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 edec24ee1..6c11994e8 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 @@ -57,15 +57,18 @@ parameters: 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 - vlans: - untagged: - vid: 0 - dhcp_on: true - primary_rack: ${_param:infra_maas_node01_hostname} + fabrics: + fabric-2: + description: "Fabric Admin" + vlan: + 0: + description: "VLAN 0" + dhcp: true sshprefs: - '{{ conf.MAAS_SSH_KEY }}' {%- if 'aarch64' in nm.cluster.arch %} |