From 8c6d4ba39ff626c5f24bd84a2958b07692ea0294 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sat, 19 Aug 2017 23:33:42 +0200 Subject: MaaS: Add support for dynamic fabric numbering Previously, we hardcoded the fabric name for our 3rd interface (which serves PXE/DHCP for the target nodes) to "fabric-2", relying on predictable index numbers to be provided by MaaS based on the interfaces defined in /etc/network/interfaces. However, the fabric IDs/names generated by MaaS are not predictable, and therefore cannot be hardcoded in our reclass model / scripts. Work around this by: - adding support for fabric ID deduction based on CIDR matching during subnet create/update operation in MaaS py module; - adding support for VLAN DHCP enablement to MaaS py module, which was previously handled via shell MaaS API operations from maas/region.sls; While at it, revert previous commit that disabled network discovery ("MaaS: Disable network discovery"), since it turns out that network discovery was not the culprit for subnet creation failure, but wrong fabric numbering. This reverts commit 8cdf22d1a1bae4694a373873cab4feb6251069b7. Change-Id: I15fa059004356cb4aaabb38999ea378dd3c0e0bb Signed-off-by: Alexandru Avadanii --- mcp/patches/patches.list | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'mcp/patches/patches.list') diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list index acacb47e0..1a651cfe0 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list @@ -2,5 +2,6 @@ /usr/share/salt-formulas/env: 0002-maas-region-skip-credentials-update.patch /usr/share/salt-formulas/env: 0003-maas-region-force-artifact-download.patch /usr/share/salt-formulas/env: 0004-maas-region-use-authorized_keys-1st-entry.patch -/usr/share/salt-formulas/env: 0005-maas-vlan-DHCP-enable-on-fabric-2.patch -/usr/share/salt-formulas/env: 0006-linux.network.interface-noifupdown-support.patch +/usr/share/salt-formulas/env: 0005-maas-module-Obtain-fabric-ID-from-CIDR.patch +/usr/share/salt-formulas/env: 0006-maas-module-Add-VLAN-DHCP-enable-support.patch +/usr/share/salt-formulas/env: 0007-linux.network.interface-noifupdown-support.patch -- cgit 1.2.3-korg