summaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-08-02 01:35:47 +0000
committerGerrit Code Review <review@openstack.org>2017-08-02 01:35:47 +0000
commitd8649e0252e4fe2ed111bff2a545216856e2cd78 (patch)
treef5d40d09c5f5a5428795ddebf7dda31d3b2b4233 /environments
parent453f51f81a22b4cb5786e8352e55ff18d5929565 (diff)
parent48cf302fb9c1ff5a4ed08fb07cc86a41b33bee9d (diff)
Merge "Fix network-isolation.j2.yaml to ignore VIPs for disabled networks"
Diffstat (limited to 'environments')
-rw-r--r--environments/network-isolation.j2.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/environments/network-isolation.j2.yaml b/environments/network-isolation.j2.yaml
index 6a7318fc..1b792afd 100644
--- 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