openstack/openstack-ansible-os_swift
Code Issues Proposed changes

Merge "Deprecate auth_plugin option"

Browse Source
This commit is contained in:
Jenkins 2017-04-06 15:58:13 +00:00 committed by Gerrit Code Review
commit 6a1669fb3d
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
defaults/main.yml
View File

@ -139,7 +139,8 @@ swift_soft_open_file_limits: 4096
swift_max_file_limits: "{{ swift_hard_open_file_limits * 24 }}" swift_max_file_limits: "{{ swift_hard_open_file_limits * 24 }}"
## Keystone authentication middleware ## Keystone authentication middleware
swift_keystone_auth_plugin: "password" swift_keystone_auth_plugin: "{{ swift_keystone_auth_type }}"
swift_keystone_auth_type: "password"
swift_dispersion_user: dispersion swift_dispersion_user: dispersion
swift_dispersion_user_domain_name: "Default" swift_dispersion_user_domain_name: "Default"

5
releasenotes/notes/deprecate_auth_plugin-397a32171826ef78.yaml Normal file
View File

@ -0,0 +1,5 @@
---
deprecations:
- The ``swift_keystone_auth_plugin`` variable has been deprecated.
``swift_keystone_auth_type`` should be used instead to configure
authentication type.

2
templates/proxy-server.conf.j2
View File

@ -56,7 +56,7 @@ use = egg:swift#tempauth
{% if 'authtoken' in swift_middleware_list %} {% if 'authtoken' in swift_middleware_list %}
[filter:authtoken] [filter:authtoken]
paste.filter_factory = keystonemiddleware.auth_token:filter_factory paste.filter_factory = keystonemiddleware.auth_token:filter_factory
auth_plugin = {{ 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 }} auth_uri = {{ keystone_service_internaluri }}
insecure = {{ keystone_service_adminuri_insecure | bool }} insecure = {{ keystone_service_adminuri_insecure | bool }}