Merge "Fix standalone ControllerOpenstack vars" into stable/pike

[apex-tripleo-heat-templates.git] / environments / network-isolation-v6.j2.yaml

diff --git a/environments/network-isolation-v6.j2.yaml b/environments/network-isolation-v6.j2.yaml
index bb27ee4..617dfa6 100644 (file)
--- 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: