openstack/tripleo-heat-templates
Code Issues Proposed changes

Don't use service_net_map_replace in krb-svc-principals

Browse Source 
Using the service_net_map replace in role_networks and
as networks keys causes the actual custom networks to
be filtered. I.e the service principals are not created.

Not using service_net_map fixes the problem.

This reverts commit f708ab7a827cc0db211b4709447f77126087347e.
This partial reverts commit 578bcb2ffad32c6a39d68b5dc360504e95972ffa.

Releted-Bug: #1946239
Closes-Bug: #1886915
Change-Id: I76a87473b2f21576570a55d0a5ef19f642521336
This commit is contained in:
Harald Jensås 2021-10-27 08:23:03 +02:00
parent 187f87ad4b
commit f6eddad78c
1 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,11 +61,7 @@ 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:
@ -82,29 +78,13 @@ 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}