Merge "Remove extra noop.yaml ports from network-isolation files."

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:

environments/network-isolation.j2.yaml

@@ -25,13 +25,12 @@ resource_registry:
 
   OS::TripleO::{{primary_role_name}}::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 %}