diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-10-07 06:11:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-10-07 06:11:18 +0000 |
| commit | 6fea40f786a466802503c03b2b815d05676e1807 (patch) | |
| tree | 482d3a8096fee0178e6ee091322d8398f5ab7c64 | |
| parent | 83f0086a6a4265ba4d13220d5f1741243fd2a881 (diff) | |
| parent | 4e700bce608ba711486c8f6a6b2bcf72c4423794 (diff) | |
Merge "Remove extra noop.yaml ports from network-isolation files." into stable/pike
| -rw-r--r-- | environments/network-isolation-v6.j2.yaml | 5 | ||||
| -rw-r--r-- | environments/network-isolation.j2.yaml | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/environments/network-isolation-v6.j2.yaml b/environments/network-isolation-v6.j2.yaml index bb27ee43..617dfa61 100644 --- 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: diff --git a/environments/network-isolation.j2.yaml b/environments/network-isolation.j2.yaml index 2db1a828..3d4f59b6 100644 --- a/environments/network-isolation.j2.yaml +++ b/environments/network-isolation.j2.yaml @@ -22,13 +22,12 @@ resource_registry: {%- endfor %} OS::TripleO::Network::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 %} |