diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-12-12 19:44:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-12-12 19:44:34 +0000 |
| commit | 77a990e3bf3585cdf4587ce9658bb50f9b50c7d2 (patch) | |
| tree | 0c175de20744bde30b35bd5007b4044302f94e49 /mcp/patches | |
| parent | 3633ccf6b4fa39e3cef23bf4690073786e133044 (diff) | |
| parent | e2c175f3114fb1857ab8ab4bb7e8ff2f8daf18bd (diff) | |
Merge "Make MTU cluster-level configurable via IDF"
Diffstat (limited to 'mcp/patches')
| -rw-r--r-- | mcp/patches/salt-formula-maas/0002-maas-region-allow-timeout-override.patch | 18 |
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" |