Merge "Fix network-isolation.j2.yaml to ignore VIPs for disabled networks"

diff --git a/environments/network-isolation.j2.yaml b/environments/network-isolation.j2.yaml
index 6a7318f..1b792af 100644 (file)
--- a/environments/network-isolation.j2.yaml
+++ b/environments/network-isolation.j2.yaml
@@ -17,7 +17,7 @@ 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