From 7ca4b62eb5067970693c41fe465cb04f1bcd7f17 Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Wed, 22 Mar 2017 11:24:16 +0800 Subject: [PATCH] Deprecate auth_plugin option Option "auth_plugin" is deprecated, use option "auth_type" instead. Change-Id: I6ac382f3856b754291378cde335bc71cd2161023 Implements: blueprint deprecate-auth-plugin --- defaults/main.yml | 3 ++- .../notes/deprecate_auth_plugin-397a32171826ef78.yaml | 5 +++++ templates/proxy-server.conf.j2 | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/deprecate_auth_plugin-397a32171826ef78.yaml diff --git a/defaults/main.yml b/defaults/main.yml index 722c63ae..861a884b 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -139,7 +139,8 @@ swift_soft_open_file_limits: 4096 swift_max_file_limits: "{{ swift_hard_open_file_limits * 24 }}" ## 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_domain_name: "Default" diff --git a/releasenotes/notes/deprecate_auth_plugin-397a32171826ef78.yaml b/releasenotes/notes/deprecate_auth_plugin-397a32171826ef78.yaml new file mode 100644 index 00000000..606cb854 --- /dev/null +++ b/releasenotes/notes/deprecate_auth_plugin-397a32171826ef78.yaml @@ -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. diff --git a/templates/proxy-server.conf.j2 b/templates/proxy-server.conf.j2 index 29172671..2d6700eb 100644 --- a/templates/proxy-server.conf.j2 +++ b/templates/proxy-server.conf.j2 @@ -56,7 +56,7 @@ use = egg:swift#tempauth {% if 'authtoken' in swift_middleware_list %} [filter:authtoken] 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_uri = {{ keystone_service_internaluri }} insecure = {{ keystone_service_adminuri_insecure | bool }}