diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-10-05 09:59:49 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2017-10-11 12:59:00 +0000 |
| commit | e0a0cb8974ccbfdb9f8f4477f15094ba8d048e55 (patch) | |
| tree | 113b2d623a3bd17c45fd880f300b8bb31d286be3 | |
| parent | 94e8238d6b61811d705b653ffb36d1aea624d015 (diff) | |
Fixes dynamic networks falling back to ctlplane
Currently when a network in network_data is disabled it no port
definitions for that network will be created per role. This results in
no fallback to the ctlplane IP because overriding a type in
network-isolation to noop.yaml does nothing when the port does not exist
for the role.
This patch changes the IPs when a network is disabled to be the same IPs
as ctlplane and fixes the issue, along with removing the need to use
noop.yaml override for ports (non-vip).
Closes-Bug: 1721542
Change-Id: I301370fbf47a71291614dd60e4c64adc7b5ebb42
Signed-off-by: Tim Rozet <trozet@redhat.com>
(cherry picked from commit 9285cb5fc99331ca63ff09df59f26b6018bc781b)
| -rw-r--r-- | overcloud.j2.yaml | 6 | ||||
| -rw-r--r-- | releasenotes/notes/fix-dynamic-network-disabled-9f700a9e900221b6.yaml | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml index 367ac5b6..3506fe8e 100644 --- a/overcloud.j2.yaml +++ b/overcloud.j2.yaml @@ -491,8 +491,12 @@ resources: type: OS::TripleO::Network::Ports::NetIpListMap properties: ControlPlaneIpList: {get_attr: [{{role.name}}, ip_address]} -{%- for network in networks if network.enabled|default(true) %} +{%- for network in networks %} + {%- if network.enabled|default(true) %} {{network.name}}IpList: {get_attr: [{{role.name}}, {{network.name_lower}}_ip_address]} + {%- else %} + {{network.name}}IpList: {get_attr: [{{role.name}}, ip_address]} + {%- endif %} {%- endfor %} EnabledServices: {get_attr: [{{role.name}}ServiceNames, value]} ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map_lower]} diff --git a/releasenotes/notes/fix-dynamic-network-disabled-9f700a9e900221b6.yaml b/releasenotes/notes/fix-dynamic-network-disabled-9f700a9e900221b6.yaml new file mode 100644 index 00000000..c6cb3636 --- /dev/null +++ b/releasenotes/notes/fix-dynamic-network-disabled-9f700a9e900221b6.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Fixes dynamic networks to fallback to ctlplane network when they are + disabled. |