aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/patches/salt-formula-maas
diff options
context:
space:
mode:
Diffstat (limited to 'mcp/patches/salt-formula-maas')
-rw-r--r--mcp/patches/salt-formula-maas/0002-maas-region-allow-timeout-override.patch18
1 files changed, 4 insertions, 14 deletions
diff --git a/mcp/patches/salt-formula-maas/0002-maas-region-allow-timeout-override.patch b/mcp/patches/salt-formula-maas/0002-maas-region-allow-timeout-override.patch
index fe5f4e671..58bed30f7 100644
--- a/mcp/patches/salt-formula-maas/0002-maas-region-allow-timeout-override.patch
+++ b/mcp/patches/salt-formula-maas/0002-maas-region-allow-timeout-override.patch
@@ -39,14 +39,14 @@ JIRA: FUEL-316
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
- maas/region.sls | 40 ++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 40 insertions(+)
+ maas/region.sls | 30 ++++++++++++++++++++++++++++++
+ 1 file changed, 30 insertions(+)
diff --git a/maas/region.sls b/maas/region.sls
-index e0f65b0..d151e3a 100644
+index e0f65b0..5da3a7f 100644
--- a/maas/region.sls
+++ b/maas/region.sls
-@@ -38,6 +38,46 @@ restore_maas_database_{{ region.database.name }}:
+@@ -38,6 +38,36 @@ restore_maas_database_{{ region.database.name }}:
{%- endif %}
@@ -70,16 +70,6 @@ index e0f65b0..d151e3a 100644
+ - require_in:
+ - service: maas_region_services
+
-+maas_ip_blksize_force:
-+ file.replace:
-+ - name: "/usr/lib/python3/dist-packages/tftp/bootstrap.py"
-+ - pattern: 'int_blksize = min\(\(int_blksize, MAX_BLOCK_SIZE\)\)'
-+ - repl: 'int_blksize = 1464'
-+ - require:
-+ - pkg: maas_region_packages
-+ - require_in:
-+ - service: maas_region_services
-+
+maas_interface_default_mode_dhcp:
+ file.replace:
+ - name: "/usr/lib/python3/dist-packages/maasserver/models/node.py"