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:
parent
dc4ecf7974
commit
a95fc76f27
|
@ -101,7 +101,7 @@ resources:
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
{%- else %}
|
{%- else %}
|
||||||
{%- if network.service_net_map_replace is defined %}
|
{%- 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 %}
|
{%- else %}
|
||||||
{{network.name_lower}}: {get_param: CloudName{{network.name}}}
|
{{network.name_lower}}: {get_param: CloudName{{network.name}}}
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
|
|
|
@ -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>`_.)
|
Loading…
Reference in New Issue