aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2017-10-16 20:46:25 +0000
committerGerrit Code Review <review@openstack.org>2017-10-16 20:46:25 +0000
commitdfec9ce2f460260af0e79c6e602dd801884c609d (patch)
treea4f57486e649528c87a17a46c29ca412a5418dc6
parent28446f77efbc91f84307bf68a97c4a4aa7f48267 (diff)
parente0a0cb8974ccbfdb9f8f4477f15094ba8d048e55 (diff)
Merge "Fixes dynamic networks falling back to ctlplane" into stable/pike
-rw-r--r--overcloud.j2.yaml6
-rw-r--r--releasenotes/notes/fix-dynamic-network-disabled-9f700a9e900221b6.yaml5
2 files changed, 10 insertions, 1 deletions
diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index 367ac5b..3506fe8 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 0000000..c6cb363
--- /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.