diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-27 00:35:15 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-27 00:35:15 +0100 |
| commit | d68bdf31c1c7d2d29f3524915f6a347f8d0567f5 (patch) | |
| tree | 1650ea25a8cba994a95152fe5da167f35340d07d /mcp/patches/0010-maas-region-allow-timeout-override.patch | |
| parent | 6eb44a1523d8ec4083c58a89436df639c6e547cf (diff) | |
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 <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/patches/0010-maas-region-allow-timeout-override.patch')
| -rw-r--r-- | mcp/patches/0010-maas-region-allow-timeout-override.patch | 28 |
1 files changed, 26 insertions, 2 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: |