Merge "Make Cinder Auth Strategy configurable"

This commit is contained in:
Jenkins 2017-04-22 20:38:58 +00:00 committed by Gerrit Code Review
commit 035eb854ea
3 changed files with 8 additions and 1 deletions

View File

@ -137,6 +137,8 @@ cinder_service_v3_adminurl: "{{ cinder_service_adminuri }}/v3/%(tenant_id)s"
cinder_service_v3_internaluri: "{{ cinder_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ cinder_service_port }}"
cinder_service_v3_internalurl: "{{ cinder_service_internaluri }}/v3/%(tenant_id)s"
cinder_auth_strategy: keystone
## Keystone authentication middleware
cinder_keystone_auth_plugin: "{{ cinder_keystone_auth_type }}"
cinder_keystone_auth_type: password

View File

@ -0,0 +1,5 @@
---
features:
- |
Added ``cinder_auth_strategy`` variable to configure Cinder's auth
strategy since Cinder can work in noauth mode as well.

View File

@ -11,7 +11,7 @@ osapi_volume_workers = {{ cinder_osapi_volume_workers }}
rootwrap_config = /etc/cinder/rootwrap.conf
api_paste_config = /etc/cinder/api-paste.ini
auth_strategy = keystone
auth_strategy = {{ cinder_auth_strategy }}
## Cinder API's enabled
enable_v1_api = {{ cinder_enable_v1_api }}