Merge "ci-ovn: Disable Swift services in scenario 007 container job" into stable...

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

diff --git a/environments/network-isolation.j2.yaml b/environments/network-isolation.j2.yaml
index 6a7318f..3d4f59b 100644 (file)
--- a/environments/network-isolation.j2.yaml
+++ b/environments/network-isolation.j2.yaml
@@ -17,21 +17,17 @@ resource_registry:
   {%- endfor %}
 
   # Port assignments for the VIPs
-  {%- for network in networks if network.vip %}
+  {%- for network in networks if network.vip and network.enabled|default(true) %}
   OS::TripleO::Network::Ports::{{network.name}}VipPort: ../network/ports/{{network.name_lower|default(network.name.lower())}}.yaml
   {%- endfor %}
   OS::TripleO::Network::Ports::RedisVipPort: ../network/ports/vip.yaml
 
-
-  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 %}