aboutsummaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorDan Sneddon <dsneddon@redhat.com>2017-09-14 13:26:53 -0600
committerEmilien Macchi <emilien@redhat.com>2017-10-07 01:00:58 +0000
commit4e700bce608ba711486c8f6a6b2bcf72c4423794 (patch)
tree2d13d4f53ba5f971fe2650c454967fb8cb136e6a /environments
parent02dffd2da7a0d9e4a8c00686747f157583291c3f (diff)
Remove extra noop.yaml ports from network-isolation files.
The environments/network-isolation[-v6].yaml files have an unneeded reference to network/ports/noop.yaml for unused networks. This introduces a regression where environment files that define the networks and ports on a per-role basis can cancel out other environment files. See bug # 1717322. The overcloud-resource-registry.j2.yaml already uses noop.yaml for every network on every role (whether or not the networks are enabled, or whether the particular network is supposed to be on a role. So having noop.yaml specified for every role in network-isolation[-v6].yaml is not needed and can cause issues with upgrades if the environments are not included in a specific order. Change-Id: If06407e5235587af090ede44674bf9c7e08e340e Closes-bug: 1717322 (cherry picked from commit 9b08df3733257ac0fbc150a4071aec051e073ef7)
Diffstat (limited to 'environments')
-rw-r--r--environments/network-isolation-v6.j2.yaml5
-rw-r--r--environments/network-isolation.j2.yaml5
2 files changed, 4 insertions, 6 deletions
diff --git a/environments/network-isolation-v6.j2.yaml b/environments/network-isolation-v6.j2.yaml
index bb27ee4..617dfa6 100644
--- a/environments/network-isolation-v6.j2.yaml
+++ b/environments/network-isolation-v6.j2.yaml
@@ -28,6 +28,7 @@ resource_registry:
OS::TripleO::Network::Ports::RedisVipPort: ../network/ports/vip_v6.yaml
+ # Port assignments by role, edit role definition to assign networks to roles.
{%- for role in roles %}
# Port assignments for the {{role.name}}
{%- for network in networks %}
@@ -36,11 +37,9 @@ resource_registry:
{%- elif network.name in role.networks|default([]) and network.enabled|default(true) and network.name == 'Tenant' %}
# IPv4 until OVS and Neutron support IPv6 tunnel endpoints
OS::TripleO::{{role.name}}::Ports::{{network.name}}Port: ../network/ports/{{network.name_lower|default(network.name.lower())}}.yaml
- {%- else %}
- OS::TripleO::{{role.name}}::Ports::{{network.name}}Port: ../network/ports/noop.yaml
{%- endif %}
{%- endfor %}
-{%- endfor %}
+{% endfor %}
parameter_defaults:
diff --git a/environments/network-isolation.j2.yaml b/environments/network-isolation.j2.yaml
index 2db1a82..3d4f59b 100644
--- a/environments/network-isolation.j2.yaml
+++ b/environments/network-isolation.j2.yaml
@@ -22,13 +22,12 @@ resource_registry:
{%- endfor %}
OS::TripleO::Network::Ports::RedisVipPort: ../network/ports/vip.yaml
+ # Port assignments by role, edit role definition to assign networks to roles.
{%- for role in roles %}
# Port assignments for the {{role.name}}
{%- for network in networks %}
{%- if network.name in role.networks|default([]) and network.enabled|default(true) %}
OS::TripleO::{{role.name}}::Ports::{{network.name}}Port: ../network/ports/{{network.name_lower|default(network.name.lower())}}.yaml
- {%- else %}
- OS::TripleO::{{role.name}}::Ports::{{network.name}}Port: ../network/ports/noop.yaml
{%- endif %}
{%- endfor %}
-{%- endfor %}
+{% endfor %}