openstack/tripleo-heat-templates
Code Issues Proposed changes

Fix custom network.name_lower in krb-service-principals

Browse Source 
The lowercase network names was hardcoded to 'external',
'internal_api' and 'storage_mgmt'. Use jinja to get the
network.name_lower value from network_data.yaml instead
so that users can customize the lowercase network name.

Closes-Bug: #1830852
Change-Id: Ie9bd482782ff770d90dfc38a585237812ed81c06
This commit is contained in:
Harald Jensås 2019-05-29 09:34:52 +02:00
parent 1ce6d43d1b
commit c0fcf8674d
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,11 +71,11 @@ 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} {{network.name_lower}}: {get_param: CloudName}
{%- elif network.name == 'InternalApi' %} {%- elif network.name == 'InternalApi' %}
internal_api: {get_param: CloudNameInternal} {{network.name_lower}}: {get_param: CloudNameInternal}
{%- elif network.name == 'StorageMgmt' %} {%- elif network.name == 'StorageMgmt' %}
storage_mgmt: {get_param: CloudNameStorageManagement} {{network.name_lower}}: {get_param: CloudNameStorageManagement}
{%- else %} {%- else %}
{{network.name_lower}}: {get_param: CloudName{{network.name}}} {{network.name_lower}}: {get_param: CloudName{{network.name}}}
{%- endif %} {%- endif %}

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>`_.)