Skip to content

Commit e403c93

Browse files
seunghun1eeAlex-Welsh
authored andcommitted
Only add OIDCXForwardedHeaders when variable is set
Currently the option OIDCXForwardedHeaders is added to wsgi-keystone.conf even when ``keystone_federation_oidc_forwarded_headers`` is empty. However, OIDCXForwardedHeaders cannot be used with empty value. This change fixes it by adding length check to the value of the variable ``keystone_federation_oidc_forwarded_headers``. Closes-Bug: #2119344 Change-Id: I516eb2cd967b4d5112fabe77f79cbf3421ec3318 Signed-off-by: Seunghun Lee <[email protected]> (cherry picked from commit d973573)
1 parent 96b7521 commit e403c93

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

ansible/roles/keystone/templates/wsgi-keystone.conf.j2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@ LogLevel info
5858
{% endif -%}
5959

6060
{% if keystone_enable_federation_openid | bool %}
61+
{% if keystone_federation_oidc_forwarded_headers | length > 0 %}
6162
OIDCXForwardedHeaders "{{ keystone_federation_oidc_forwarded_headers }}"
63+
{% endif %}
6264
OIDCClaimPrefix "OIDC-"
6365
OIDCClaimDelimiter "{{ keystone_federation_oidc_claim_delimiter }}"
6466
OIDCResponseType "{{ keystone_federation_oidc_response_type }}"
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
fixes:
3+
- |
4+
Fixes the bug where Keystone become unable to start when the option
5+
``OIDCXForwardedHeaders`` is set with empty string in
6+
``wsgi-keystone.conf``.
7+
`LP#2119344 <https://bugs.launchpad.net/kolla-ansible/+bug/2119344>`__

0 commit comments

Comments
 (0)