openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix custom network.name_lower in krb-service-principals" into stable/stein

Browse Source
This commit is contained in:
Zuul 2019-06-04 16:25:12 +00:00 committed by Gerrit Code Review
commit bbabe8db31
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,13 +71,29 @@ 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' %}
external: {get_param: CloudName} {%- 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' %} {%- elif network.name == 'InternalApi' %}
internal_api: {get_param: CloudNameInternal} {%- 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' %} {%- elif network.name == 'StorageMgmt' %}
storage_mgmt: {get_param: CloudNameStorageManagement} {%- 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 %} {%- else %}
{%- if network.service_net_map_replace is defined %}
{{network.service_net_map_replace}}: {get_param: CloudNameStorageManagement}
{%- 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}

7
releasenotes/notes/fix-custom-netname-lower-and-tls-everywhere-1f2300f9a2ba4d98.yaml Normal file
View File

@ -0,0 +1,7 @@
---
fixes:
- |
Fixes an issue where deployment would fail if a non-default ``name_lower``
is used in network data for one of the networks: ``External``,
``InternalApi`` or ``StorageMgmt``.
(See `bug: 1830852 <https://bugs.launchpad.net/tripleo/+bug/1830852>`_.)