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 --- ...inux.network.interface-noifupdown-support.patch | 26 ---------------------- 1 file changed, 26 deletions(-) delete mode 100644 mcp/patches/0006-linux.network.interface-noifupdown-support.patch (limited to 'mcp/patches/0006-linux.network.interface-noifupdown-support.patch') diff --git a/mcp/patches/0006-linux.network.interface-noifupdown-support.patch b/mcp/patches/0006-linux.network.interface-noifupdown-support.patch deleted file mode 100644 index 5d9ce7be5..000000000 --- a/mcp/patches/0006-linux.network.interface-noifupdown-support.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Alexandru Avadanii -Date: Sat, 5 Aug 2017 02:03:01 +0200 -Subject: [PATCH] linux.network.interface: noifupdown support - -According to [1], salt states/network supports "noifupdown" as a -parameter for each interface. -Adjust salt formula part for `linux.network.interface`, by extending -the "interface_params" in accordingly. - -Signed-off-by: Alexandru Avadanii -Signed-off-by: Charalampos Kominos -Signed-off-by: Guillermo Herrero ---- - -diff --git a/linux/map.jinja b/linux/map.jinja -index d3227ca..8a2243d 100644 ---- a/linux/map.jinja -+++ b/linux/map.jinja -@@ -92,6 +92,7 @@ - 'updelay', - 'hashing-algorithm', - 'hardware-dma-ring-rx', -+ 'noifupdown', - ] %} - - {% set network = salt['grains.filter_by']({ -- cgit 1.2.3-korg