openstack/openstack-ansible-os_cinder
Code Issues Proposed changes

Merge "Deprecate auth_plugin option"

Browse Source
This commit is contained in:
Jenkins 2017-04-05 03:21:32 +00:00 committed by Gerrit Code Review
commit 35d3e242ec
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

@ -138,7 +138,8 @@ cinder_service_v3_internaluri: "{{ cinder_service_internaluri_proto }}://{{ inte
cinder_service_v3_internalurl: "{{ cinder_service_internaluri }}/v3/%(tenant_id)s"
## Keystone authentication middleware
cinder_keystone_auth_plugin: password
cinder_keystone_auth_plugin: "{{ cinder_keystone_auth_type }}"
cinder_keystone_auth_type: password
## In order to enable the cinder backup you MUST set ``cinder_service_backup_program_enabled`` to "true"
cinder_service_backup_program_enabled: false

5
releasenotes/notes/deprecate_auth_plugin-1a78326719d67f23.yaml Normal file
View File

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

2
templates/cinder.conf.j2
View File

@ -134,7 +134,7 @@ api_class = castellan.key_manager.barbican_key_manager.BarbicanKeyManager
[keystone_authtoken]
insecure = {{ keystone_service_internaluri_insecure | bool }}
auth_plugin = {{ cinder_keystone_auth_plugin }}
auth_type = {{ cinder_keystone_auth_plugin }}
auth_url = {{ keystone_service_adminurl }}
auth_uri = {{ keystone_service_internaluri }}
project_domain_id = {{ cinder_service_project_domain_id }}