openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Fix krb-service-principals with service_net_map_replace 

The CloudNameStorageManagement property was used for almost all
networks when service_net_map_replace is defined. This should
not be hardcoded to StorageManagement, it needs to be replaced
by {{network.name}}.

Closes-Bug: #1862679
Change-Id: I140aa8e44134130d03f6670a9314783288396dde
(cherry picked from commit 0af021bc5f)
This commit is contained in:
Harald Jensås 2020-02-10 19:34:09 +01:00 committed by Bob Fournier
parent dc4ecf7974
commit a95fc76f27
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,7 +101,7 @@ resources:
{%- endif %}
{%- else %}
{%- if network.service_net_map_replace is defined %}
{{network.service_net_map_replace}}: {get_param: CloudNameStorageManagement}
{{network.service_net_map_replace}}: {get_param: CloudName{{network.name}}}
{%- else %}
{{network.name_lower}}: {get_param: CloudName{{network.name}}}
{%- endif %}

6
releasenotes/notes/fix-krb-service-principals-with-service-net-map-replace-463dd1296766cc47.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
Fixes an issue where the parameter ``CloudNameStorageManagement`` was used
for all custom networks with service_net_map_replace defined.
(See bug: `1862679 <https://bugs.launchpad.net/tripleo/+bug/1862679>`_.)