Deprecate auth_plugin option

Option "auth_plugin" is deprecated, use option "auth_type" instead.

Change-Id: Ibe125dc89b7c59daf83b950692319ec18457d3f2
Implements: blueprint deprecate-auth-plugin
This commit is contained in:
ZhongShengping 2017-03-22 11:26:51 +08:00
parent e343041ab9
commit 1e3a4a4463
3 changed files with 9 additions and 3 deletions

View File

@ -72,7 +72,8 @@ zaqar_service_internalurl: "{{ zaqar_service_internaluri }}"
zaqar_service_adminuri: "{{ zaqar_service_adminuri_proto }}://{{ zaqar_api_bind_address }}:{{ zaqar_api_bind_port }}"
zaqar_service_adminurl: "{{ zaqar_service_adminuri }}"
zaqar_service_cafile_path: /opt/stack/data/ca-bundle.pem
zaqar_keystone_auth_plugin: password
zaqar_keystone_auth_plugin: "{{ zaqar_keystone_auth_type }}"
zaqar_keystone_auth_type: password
## Apache setup
zaqar_install_apache: false

View File

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

View File

@ -297,7 +297,7 @@ bind = 0.0.0.0
[keystone_authtoken]
#signing_dir = /var/cache/zaqar
auth_plugin = {{ zaqar_keystone_auth_plugin }}
auth_type = {{ zaqar_keystone_auth_plugin }}
auth_url = {{ keystone_service_adminuri }}
auth_uri = {{ keystone_service_internaluri }}
project_domain_id = default
@ -598,4 +598,4 @@ message_pipeline = zaqar.notification.notifier
#max_claim_grace = 43200
# Defines supported subscriber types. (list value)
#subscriber_types = http,https,mailto
#subscriber_types = http,https,mailto