openstack/kolla-ansible
Code Issues Proposed changes

keystone: ensure bool for two parameters

Browse Source 
* keystone_enable_federation_openid
* enable_keystone_federation

Closes-Bug: #2036390

Change-Id: Ieef1dce006c339643ad4fa544218c6482c2ad32c
This commit is contained in:
Christian Berendt 2023-09-17 21:44:38 +02:00 committed by Dr. Jens Harbott
parent f6d0ffd61c
commit c9a4b36e52
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/keystone/templates/keystone.conf.j2
View File

@ -82,7 +82,7 @@ connection_string = {{ osprofiler_backend_connection_string }}
allowed_origin = {{ grafana_public_endpoint }} allowed_origin = {{ grafana_public_endpoint }}
{% endif %} {% endif %}
{% if enable_keystone_federation %} {% if enable_keystone_federation | bool %}
[federation] [federation]
{% for dashboard in keystone_trusted_dashboards %} {% for dashboard in keystone_trusted_dashboards %}
trusted_dashboard = {{ dashboard }} trusted_dashboard = {{ dashboard }}

2
ansible/roles/keystone/templates/keystone.json.j2
View File

@ -78,7 +78,7 @@
{ {
"path": "/var/log/kolla/keystone/keystone.log", "path": "/var/log/kolla/keystone/keystone.log",
"owner": "keystone:keystone" "owner": "keystone:keystone"
},{% if keystone_enable_federation_openid %} },{% if keystone_enable_federation_openid | bool %}
{ {
"path": "{{ keystone_container_federation_oidc_metadata_folder }}", "path": "{{ keystone_container_federation_oidc_metadata_folder }}",
"owner": "{{ apache_user }}:{{ apache_user }}", "owner": "{{ apache_user }}:{{ apache_user }}",

2
ansible/roles/keystone/templates/wsgi-keystone.conf.j2
View File

@ -62,7 +62,7 @@ LogLevel info
SSLCertificateKeyFile /etc/keystone/certs/keystone-key.pem SSLCertificateKeyFile /etc/keystone/certs/keystone-key.pem
{% endif -%} {% endif -%}
{% if keystone_enable_federation_openid %} {% if keystone_enable_federation_openid | bool %}
OIDCClaimPrefix "OIDC-" OIDCClaimPrefix "OIDC-"
OIDCClaimDelimiter ";" OIDCClaimDelimiter ";"
OIDCResponseType "{{ keystone_federation_oidc_response_type }}" OIDCResponseType "{{ keystone_federation_oidc_response_type }}"

7
releasenotes/notes/bug-2036390-d087c5bfd504c9f3.yaml Normal file
View File

@ -0,0 +1,7 @@
---
fixes:
- |
``enable_keystone_federation`` and ``keystone_enable_federation_openid``
have not been explicitly handled as bool in various templates in the
keystone role so far.
`LP#2036390 <https://bugs.launchpad.net/kolla-ansible/+bug/2036390>`__