aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/patches/0011-maas-region-interface-default-mode-DHCP.patch
diff options
context:
space:
mode:
Diffstat (limited to 'mcp/patches/0011-maas-region-interface-default-mode-DHCP.patch')
-rw-r--r--mcp/patches/0011-maas-region-interface-default-mode-DHCP.patch44
1 files changed, 0 insertions, 44 deletions
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 <Alexandru.Avadanii@enea.com>
-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 <Alexandru.Avadanii@enea.com>
----
-
-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: