diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-11-28 11:57:03 +0000 |
|---|---|---|
| committer |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-28 19:13:27 +0000 |
| commit | e3302dfa84ddc65fc1b8f79a209fa0b621be379c (patch) | |
| tree | 105f75d30dc3e07d5b24542d3bcb2c14d9669e74 | |
| parent | 2e7e259988bc40ff217de6c2035b689f17794162 (diff) | |
Revert "[baremetal] Fix maas_subnets without maas_fabrics"
The upstream commit has been merged
https://github.com/salt-formulas/salt-formula-maas/commit/0c622327
This reverts commit 2c48915a1a77aa3ac0133155fd0cdadbf280493d.
Change-Id: Iff86f3dc171371903e3294eed43977eb6197a5e7
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit 2ecb98f7e7c67984fd66e2d6b17d5c05c058490b)
| -rw-r--r-- | mcp/patches/0013-maas-region-Allow-subnets-without-fabrics.patch | 31 | ||||
| -rw-r--r-- | mcp/patches/patches.list | 1 |
2 files changed, 0 insertions, 32 deletions
diff --git a/mcp/patches/0013-maas-region-Allow-subnets-without-fabrics.patch b/mcp/patches/0013-maas-region-Allow-subnets-without-fabrics.patch deleted file mode 100644 index 1f55dc696..000000000 --- a/mcp/patches/0013-maas-region-Allow-subnets-without-fabrics.patch +++ /dev/null @@ -1,31 +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: Thu, 23 Nov 2017 03:33:01 +0200 -Subject: [PATCH] maas: region: Allow subnets without fabrics - -Configuring subnets should be possible without explicitly configuring -fabrics. - -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 -@@ -186,7 +186,9 @@ - - name: maas.process_subnets - - require: - - module: maas_config -+ {%- if region.get('fabrics', False) %} - - module: maas_fabrics -+ {%- endif %} - {%- endif %} - - {%- if region.get('devices', False) %} diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list index 6358109ce..d0bb7c431 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list @@ -17,4 +17,3 @@ /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: 0012-linux.storage.lvm-Disable-filter.patch -/usr/share/salt-formulas/env: 0013-maas-region-Allow-subnets-without-fabrics.patch |