From d68bdf31c1c7d2d29f3524915f6a347f8d0567f5 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 27 Dec 2017 00:35:15 +0100 Subject: patches: Squash maas region changes When re-deploying with `-f` flag, `patch -R` cannot cleanly revert maas region changes with overlapping context lines, so squash them into a single file. Change-Id: I87dae72a12fea833e9e6729de21d4ce5f262695e Signed-off-by: Alexandru Avadanii --- ...1-maas-region-interface-default-mode-DHCP.patch | 44 ---------------------- 1 file changed, 44 deletions(-) delete mode 100644 mcp/patches/0011-maas-region-interface-default-mode-DHCP.patch (limited to 'mcp/patches/0011-maas-region-interface-default-mode-DHCP.patch') diff --git a/mcp/patches/0011-maas-region-interface-default-mode-DHCP.patch b/mcp/patches/0011-maas-region-interface-default-mode-DHCP.patch deleted file mode 100644 index d161a9527..000000000 --- a/mcp/patches/0011-maas-region-interface-default-mode-DHCP.patch +++ /dev/null @@ -1,44 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2017 Mirantis Inc., Enea AB and others. -: -: All rights reserved. This program and the accompanying materials -: are made available under the terms of the Apache License, Version 2.0 -: which accompanies this distribution, and is available at -: http://www.apache.org/licenses/LICENSE-2.0 -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -From: Alexandru Avadanii -Date: Mon, 18 Dec 2017 02:03:01 +0200 -Subject: [PATCH] maas: region: interface: default mode DHCP - -Switch MaaS interface mode default from AUTO to DHCP. -This way, MaaS will not statically assign IPs *outside* the dynamic -reserved range, but instead DHCP will assign them *inside* the range. - -One alternative would be to handle this via API calls, for each -node's PXE physical interface, but that overcomplicates things. - -JIRA: FUEL-316 - -Signed-off-by: Alexandru Avadanii ---- - -diff --git a/maas/region.sls b/maas/region.sls ---- a/maas/region.sls -+++ b/maas/region.sls -@@ -39,6 +39,16 @@ - - require_in: - - service: maas_region_services - -+maas_interface_default_mode_dhcp: -+ file.replace: -+ - name: "/usr/lib/python3/dist-packages/maasserver/models/node.py" -+ - pattern: '^(\s+INTERFACE_LINK_TYPE)\.AUTO' -+ - repl: \1.DHCP -+ - require: -+ - pkg: maas_region_packages -+ - require_in: -+ - service: maas_region_services -+ - {%- if region.get('enable_iframe', False) %} - - /etc/apache2/conf-enabled/maas-http.conf: -- cgit 1.2.3-korg