openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Relax filtering in krb-service-principals jinja 

The filtering added to fix Bug: #1821377 filters any
network without a VIP address. This filtering is to
agressive and cause deployment failure when a management
network without a VIP is used.

Change-Id: If189eb6fc0b2dc2c78323a7c08f7e303be2b6124
Resolves: rhbz#1778719
Closes-Bug: #1854846
(cherry picked from commit af79ae34ad)
This commit is contained in:
Harald Jensås 2019-12-02 18:49:45 +01:00
parent 57b3fac534
commit bc0bd3f151
2 changed files with 8 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

@ -60,7 +60,7 @@ resources:
role_data: {get_param: RoleData} role_data: {get_param: RoleData}
role_networks: role_networks:
- ctlplane - ctlplane
{%- for network in networks if network.vip|default(false) and network.name in role.networks %} {%- for network in networks if network.name in role.networks %}
{%- if network.service_net_map_replace is defined %} {%- if network.service_net_map_replace is defined %}
- {{network.service_net_map_replace}} - {{network.service_net_map_replace}}
{%- else %} {%- else %}

7
releasenotes/notes/fix-krb-service-principals-do-not-filter-on-vip-in-jinja-c8f996ffed94d3cd.yaml Normal file
View File

@ -0,0 +1,7 @@
---
fixes:
- |
Fixes an issue where filtering of networks for kerberos service principals
was too aggressive, causing deployment failure. See bug `1854846
<https://bugs.launchpad.net/tripleo/+bug/1854846>`_.