openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Revert "Fix TLS-e with custom network names""

This commit is contained in:
Zuul 2021-10-26 15:14:09 +00:00 committed by Gerrit Code Review
parent 41e920d1dc 82a0781b4d
commit 187f87ad4b
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deployment/haproxy/haproxy-internal-tls-certmonger.j2.yaml
View File

@ -59,8 +59,7 @@ resources:
# network will be handled in another template.
- ctlplane
{%- for network in networks if network.enabled|default(true) and network.vip|default(false) %}
# TODO: use ServiceNetMap instead for a better filtering.
{%- if network.name_lower != 'external' and network.name_lower != 'tenant' and (network.service_net_map_replace is defined and network.service_net_map_replace != 'tenant' and network.service_net_map_replace != 'external') %}
{%- if network.name_lower != 'external' and network.name_lower != 'tenant' %}
- {{network.name_lower}}
{%- endif %}
{%- endfor %}

20
extraconfig/nova_metadata/krb-service-principals/role.role.j2.yaml
View File

@ -61,7 +61,11 @@ resources:
role_networks:
- ctlplane
{%- for network in networks if network.name in role.networks %}
{%- if network.service_net_map_replace is defined %}
- {{network.service_net_map_replace}}
{%- else %}
- {{network.name_lower}}
{%- endif %}
{%- endfor %}
# Generates entries for nova metadata with the following format:
@ -78,13 +82,29 @@ resources:
fqdns:
{%- for network in networks if network.vip|default(false) and network.name in role.networks %}
{%- if network.name == 'External' %}
{%- if network.service_net_map_replace is defined %}
{{network.service_net_map_replace}}: {get_param: CloudName}
{%- else %}
{{network.name_lower}}: {get_param: CloudName}
{%- endif %}
{%- elif network.name == 'InternalApi' %}
{%- if network.service_net_map_replace is defined %}
{{network.service_net_map_replace}}: {get_param: CloudNameInternal}
{%- else %}
{{network.name_lower}}: {get_param: CloudNameInternal}
{%- endif %}
{%- elif network.name == 'StorageMgmt' %}
{%- if network.service_net_map_replace is defined %}
{{network.service_net_map_replace}}: {get_param: CloudNameStorageManagement}
{%- else %}
{{network.name_lower}}: {get_param: CloudNameStorageManagement}
{%- endif %}
{%- else %}
{%- if network.service_net_map_replace is defined %}
{{network.service_net_map_replace}}: {get_param: CloudName{{network.name}}}
{%- else %}
{{network.name_lower}}: {get_param: CloudName{{network.name}}}
{%- endif %}
{%- endif %}
{%- endfor %}
ctlplane: {get_param: CloudNameCtlplane}