48cf302fb9
This change modifies network-isolation.j2.yaml to ignore VIPs for networks that are disabled. This fixes a bug where VIPs would be created in network-isolation.yaml even if a network was disabled. Change-Id: I331b8fec3847bce6ca6c22a9f173055121ef65c9
38 lines
1.6 KiB
YAML
38 lines
1.6 KiB
YAML
{%- set primary_role = [roles[0]] -%}
|
|
{%- for role in roles -%}
|
|
{%- if 'primary' in role.tags and 'controller' in role.tags -%}
|
|
{%- set _ = primary_role.pop() -%}
|
|
{%- set _ = primary_role.append(role) -%}
|
|
{%- endif -%}
|
|
{%- endfor -%}
|
|
{%- set primary_role_name = primary_role[0].name -%}
|
|
# Enable the creation of Neutron networks for isolated Overcloud
|
|
# traffic and configure each role to assign ports (related
|
|
# to that role) on these networks.
|
|
# primary role is: {{primary_role_name}}
|
|
resource_registry:
|
|
# networks as defined in network_data.yaml
|
|
{%- for network in networks if network.enabled|default(true) %}
|
|
OS::TripleO::Network::{{network.name}}: ../network/{{network.name_lower|default(network.name.lower())}}.yaml
|
|
{%- endfor %}
|
|
|
|
# Port assignments for the VIPs
|
|
{%- 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
|
|
|
|
{%- 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 %}
|