diff options
Diffstat (limited to 'mcp/patches')
| -rw-r--r-- | mcp/patches/0010-maas-region-allow-timeout-override.patch | 28 | ||||
| -rw-r--r-- | mcp/patches/0011-maas-region-interface-default-mode-DHCP.patch | 44 | ||||
| -rw-r--r-- | mcp/patches/patches.list | 1 |
3 files changed, 26 insertions, 47 deletions
diff --git a/mcp/patches/0010-maas-region-allow-timeout-override.patch b/mcp/patches/0010-maas-region-allow-timeout-override.patch index 6763b8efd..37bdf5855 100644 --- a/mcp/patches/0010-maas-region-allow-timeout-override.patch +++ b/mcp/patches/0010-maas-region-allow-timeout-override.patch @@ -10,7 +10,10 @@ From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> Date: Sat, 23 Sep 2017 02:03:01 +0200 Subject: [PATCH] maas: region: allow timeout override -Poor implementation that allows overiding comissioning/deploying +Two changes are squashed into a single patch so we can test for +reverse-applying the cummulative diff. + +1. Poor implementation that allows overiding comissioning/deploying timeouts, which are hardcoded in MaaS source code. Add the following reclass _param: @@ -19,13 +22,24 @@ Add the following reclass _param: The defaults are now 10/15 minutes (MaaS defaults to 20/40 min). +2. 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 -@@ -19,6 +19,26 @@ +@@ -19,6 +19,36 @@ - require: - pkg: maas_region_packages @@ -49,6 +63,16 @@ diff --git a/maas/region.sls b/maas/region.sls + - 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: 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: diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list index f2549d7bb..a54fadced 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list @@ -14,5 +14,4 @@ /usr/share/salt-formulas/env: 0008-Handle-file_recv-option.patch /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch /usr/share/salt-formulas/reclass: 0011-service.horizon.server.cluster-Default-to-v2-API.patch -/usr/share/salt-formulas/env: 0011-maas-region-interface-default-mode-DHCP.patch /usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch |