openstack/openstack-ansible-os_swift
Code Issues Proposed changes

Merge "Update auth_uri option to www_authenticate_uri"

Browse Source
This commit is contained in:
Zuul 2018-09-08 21:39:31 +00:00 committed by Gerrit Code Review
commit b216283ed0
1 changed files with 2 additions and 2 deletions

4
templates/proxy-server.conf.j2

@ -58,7 +58,7 @@ use = egg:swift#tempauth
paste.filter_factory = keystonemiddleware.auth_token:filter_factory paste.filter_factory = keystonemiddleware.auth_token:filter_factory
auth_type = {{ swift_keystone_auth_plugin }} auth_type = {{ swift_keystone_auth_plugin }}
auth_url = {{ keystone_service_adminuri }} auth_url = {{ keystone_service_adminuri }}
auth_uri = {{ keystone_service_internaluri }} www_authenticate_uri = {{ keystone_service_internaluri }}
insecure = {{ keystone_service_adminuri_insecure | bool }} insecure = {{ keystone_service_adminuri_insecure | bool }}
region_name = {{ keystone_service_region }} region_name = {{ keystone_service_region }}
project_domain_id = {{ swift_service_project_domain_id }} project_domain_id = {{ swift_service_project_domain_id }}
@ -116,7 +116,7 @@ storage_domain = {{ swift_swift3_storage_domain }}
{% if 's3token' in swift_middleware_list %} {% if 's3token' in swift_middleware_list %}
[filter:s3token] [filter:s3token]
use = egg:swift3#s3token use = egg:swift3#s3token
auth_uri = {{ keystone_service_adminuri }} www_authenticate_uri = {{ keystone_service_adminuri }}
{% endif %} {% endif %}
[filter:healthcheck] [filter:healthcheck]