From 4e700bce608ba711486c8f6a6b2bcf72c4423794 Mon Sep 17 00:00:00 2001 From: Dan Sneddon Date: Thu, 14 Sep 2017 13:26:53 -0600 Subject: 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) --- environments/network-isolation.j2.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'environments/network-isolation.j2.yaml') diff --git a/environments/network-isolation.j2.yaml b/environments/network-isolation.j2.yaml index 2db1a828..3d4f59b6 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 %} -- cgit 1.2.3-korg