From 6a55fccd310cfcc3df263f9047a52d55d6e84074 Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Wed, 22 Mar 2017 11:25:35 +0800 Subject: [PATCH] Deprecate auth_plugin option Option "auth_plugin" is deprecated, use option "auth_type" instead. Change-Id: I77f5757a4d12c8320702bcf3685c5de7417ceda6 Implements: blueprint deprecate-auth-plugin --- defaults/main.yml | 3 ++- .../notes/deprecate_auth_plugin-451832a71b967e27.yaml | 5 +++++ templates/trove.conf.j2 | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/deprecate_auth_plugin-451832a71b967e27.yaml diff --git a/defaults/main.yml b/defaults/main.yml index 8b13e0e..283aaea 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -126,7 +126,8 @@ trove_rabbitmq_port: 5672 trove_rabbitmq_servers: "{{ rabbitmq_servers }}" # Keystone AuthToken/Middleware -trove_keystone_auth_plugin: password +trove_keystone_auth_plugin: "{{ trove_keystone_auth_type }}" +trove_keystone_auth_type: password trove_service_project_domain_name: Default trove_service_user_domain_name: default trove_service_project_domain_id: default diff --git a/releasenotes/notes/deprecate_auth_plugin-451832a71b967e27.yaml b/releasenotes/notes/deprecate_auth_plugin-451832a71b967e27.yaml new file mode 100644 index 0000000..025ae78 --- /dev/null +++ b/releasenotes/notes/deprecate_auth_plugin-451832a71b967e27.yaml @@ -0,0 +1,5 @@ +--- +deprecations: + - The ``trove_keystone_auth_plugin`` variable has been deprecated. + ``trove_keystone_auth_type`` should be used instead to configure + authentication type. diff --git a/templates/trove.conf.j2 b/templates/trove.conf.j2 index 334543b..f4bc351 100644 --- a/templates/trove.conf.j2 +++ b/templates/trove.conf.j2 @@ -76,7 +76,7 @@ api_paste_config = api-paste.ini [keystone_authtoken] insecure = {{ keystone_service_internaluri_insecure | bool }} -auth_plugin = {{ trove_keystone_auth_plugin }} +auth_type = {{ trove_keystone_auth_plugin }} auth_url = {{ keystone_service_adminuri }} auth_uri = {{ keystone_service_internaluri }} project_domain_id = {{ trove_service_project_domain_id }}