diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-23 02:31:28 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-23 02:31:28 +0100 |
| commit | 2c48915a1a77aa3ac0133155fd0cdadbf280493d (patch) | |
| tree | 4a3c9492ea6b14ea27e25f9399f69c3850e132cd /mcp/patches | |
| parent | e92a846313d0ff7a1b0b75e1551fd053621a921d (diff) | |
[baremetal] Fix maas_subnets without maas_fabrics
Change-Id: I603b39d46d3f2f2448b8f9746ad0745e416bbee7
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/patches')
| -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, 32 insertions, 0 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 new file mode 100644 index 000000000..1f55dc696 --- /dev/null +++ b/mcp/patches/0013-maas-region-Allow-subnets-without-fabrics.patch @@ -0,0 +1,31 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: 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 d0bb7c431..6358109ce 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list @@ -17,3 +17,4 @@ /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 |