Don't use service_net_map_replace in krb-svc-principals
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 commitf708ab7a82
. This partial reverts commit578bcb2ffa
. Releted-Bug: #1946239 Closes-Bug: #1886915 Change-Id: I76a87473b2f21576570a55d0a5ef19f642521336
This commit is contained in:
parent
187f87ad4b
commit
f6eddad78c
|
@ -61,11 +61,7 @@ resources:
|
||||||
role_networks:
|
role_networks:
|
||||||
- ctlplane
|
- ctlplane
|
||||||
{%- for network in networks if network.name in role.networks %}
|
{%- 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}}
|
- {{network.name_lower}}
|
||||||
{%- endif %}
|
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
|
|
||||||
# Generates entries for nova metadata with the following format:
|
# Generates entries for nova metadata with the following format:
|
||||||
|
@ -82,29 +78,13 @@ resources:
|
||||||
fqdns:
|
fqdns:
|
||||||
{%- for network in networks if network.vip|default(false) and network.name in role.networks %}
|
{%- for network in networks if network.vip|default(false) and network.name in role.networks %}
|
||||||
{%- if network.name == 'External' %}
|
{%- 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}
|
{{network.name_lower}}: {get_param: CloudName}
|
||||||
{%- endif %}
|
|
||||||
{%- elif network.name == 'InternalApi' %}
|
{%- 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}
|
{{network.name_lower}}: {get_param: CloudNameInternal}
|
||||||
{%- endif %}
|
|
||||||
{%- elif network.name == 'StorageMgmt' %}
|
{%- 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}
|
{{network.name_lower}}: {get_param: CloudNameStorageManagement}
|
||||||
{%- endif %}
|
|
||||||
{%- else %}
|
{%- 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}}}
|
{{network.name_lower}}: {get_param: CloudName{{network.name}}}
|
||||||
{%- endif %}
|
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
ctlplane: {get_param: CloudNameCtlplane}
|
ctlplane: {get_param: CloudNameCtlplane}
|
||||||
|
|
Loading…
Reference in New Issue