diff options
| author | Zuul <zuul@review.opendev.org> | 2022-03-24 16:30:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-03-24 16:30:18 +0000 |
| commit | 87f6ff934cb99f3d8b791e3ed661b3504e1d0ed1 (patch) | |
| tree | 03c4b8cb7fda17d87763fd0f5e936bdb4c3e3902 /ansible | |
| parent | efadc9591327edabf13d6c0b74178993bf5ef382 (diff) | |
| parent | 3ca805041b0fd0847874a479a5bb4fb79b053570 (diff) | |
| download | kolla-ansible-87f6ff934cb99f3d8b791e3ed661b3504e1d0ed1.tar.gz kolla-ansible-87f6ff934cb99f3d8b791e3ed661b3504e1d0ed1.zip | |
Merge "Enable memcached backend for mod_auth_openidc"
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/keystone/defaults/main.yml | 3 | ||||
| -rw-r--r-- | ansible/roles/keystone/templates/wsgi-keystone.conf.j2 | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/ansible/roles/keystone/defaults/main.yml b/ansible/roles/keystone/defaults/main.yml index 76241d54e..790250033 100644 --- a/ansible/roles/keystone/defaults/main.yml +++ b/ansible/roles/keystone/defaults/main.yml @@ -214,3 +214,6 @@ keystone_should_remove_attribute_mappings: False keystone_should_remove_identity_providers: False keystone_federation_oidc_response_type: "id_token" keystone_federation_oidc_scopes: "openid email profile" + +# OIDC caching +keystone_oidc_enable_memcached: "{{ enable_memcached }}" diff --git a/ansible/roles/keystone/templates/wsgi-keystone.conf.j2 b/ansible/roles/keystone/templates/wsgi-keystone.conf.j2 index 9f7236e68..8408268e3 100644 --- a/ansible/roles/keystone/templates/wsgi-keystone.conf.j2 +++ b/ansible/roles/keystone/templates/wsgi-keystone.conf.j2 @@ -64,6 +64,10 @@ LogLevel info {% endif %} OIDCCryptoPassphrase {{ keystone_federation_openid_crypto_password }} OIDCRedirectURI {{ keystone_public_url }}/redirect_uri +{% if enable_memcached | bool and keystone_oidc_enable_memcached | bool %} + OIDCCacheType memcache + OIDCMemCacheServers "{% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}" +{% endif %} <Location ~ "/redirect_uri"> Require valid-user |