f543752da6
There is an extra RedisVipPort defined in network-isolation.j2.yaml which is unused. This will waste an IP address, and can lead to confusion if there are multiple ports named RedisVipPort. This patch removes the extra (unneeded) instance of the VIP. Change-Id: I222873859af1b4ed1050cfffe55687b2f8d4c528 Closes-bug: 1717017
34 lines
1.5 KiB
YAML
34 lines
1.5 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
|
|
|
|
# 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
|
|
{%- endif %}
|
|
{%- endfor %}
|
|
{% endfor %}
|