openstack/openstack-ansible-os_cinder
Code Issues Proposed changes

Update keystone middleware in cinder for Kilo

Browse Source 
Update keystone authentication middleware in cinder to
support the v3 API in Kilo.

Partially implements: blueprint master-kilofication

Change-Id: Ib71cffc7065d3da51539c2f96281c9ce870ac864
This commit is contained in:
Matthew Kassawara 2015-04-14 11:20:42 -05:00
parent 9b472d3d74
commit 64948ada0b
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
defaults/main.yml
View File

@ -47,8 +47,10 @@ cinder_enable_v2_api: true
## Cinder api service type and data ## Cinder api service type and data
cinder_service_name: cinder cinder_service_name: cinder
cinder_service_project_domain_id: default
cinder_service_user_domain_id: default
cinder_service_user_name: cinder cinder_service_user_name: cinder
cinder_service_tenant_name: service cinder_service_project_name: service
cinder_service_role_name: admin cinder_service_role_name: admin
cinder_service_region: RegionOne cinder_service_region: RegionOne
cinder_service_description: "Cinder Volume Service" cinder_service_description: "Cinder Volume Service"
@ -75,6 +77,9 @@ cinder_service_v2_adminurl: "{{ cinder_service_adminuri }}/v2/%(tenant_id)s"
cinder_service_v2_internaluri: "{{ cinder_service_proto }}://{{ internal_lb_vip_address }}:{{ cinder_service_port }}" cinder_service_v2_internaluri: "{{ cinder_service_proto }}://{{ internal_lb_vip_address }}:{{ cinder_service_port }}"
cinder_service_v2_internalurl: "{{ cinder_service_internaluri }}/v2/%(tenant_id)s" cinder_service_v2_internalurl: "{{ cinder_service_internaluri }}/v2/%(tenant_id)s"
## Keystone authentication middleware
cinder_keystone_auth_plugin: password
## In order to enable the cinder backup you MUST set ``cinder_backup_program_enabled`` to "true" ## In order to enable the cinder backup you MUST set ``cinder_backup_program_enabled`` to "true"
## Additionally the configuration section will not be put in the `cinder.conf` file unless the ## Additionally the configuration section will not be put in the `cinder.conf` file unless the
## following variables are defined: ## following variables are defined:

4
tasks/cinder_service_setup.yml
View File

@ -16,7 +16,7 @@
- include: cinder_service_add.yml - include: cinder_service_add.yml
vars: vars:
service_user_name: "{{ cinder_service_user_name }}" service_user_name: "{{ cinder_service_user_name }}"
service_tenant_name: "{{ cinder_service_tenant_name }}" service_tenant_name: "{{ cinder_service_project_name }}"
service_name: "{{ cinder_service_name }}" service_name: "{{ cinder_service_name }}"
service_type: "{{ cinder_service_type }}" service_type: "{{ cinder_service_type }}"
service_region: "{{ cinder_service_region }}" service_region: "{{ cinder_service_region }}"
@ -32,7 +32,7 @@
- include: cinder_service_add.yml - include: cinder_service_add.yml
vars: vars:
service_user_name: "{{ cinder_service_user_name }}" service_user_name: "{{ cinder_service_user_name }}"
service_tenant_name: "{{ cinder_service_tenant_name }}" service_tenant_name: "{{ cinder_service_project_name }}"
service_name: "{{ cinder_service_v2_name }}" service_name: "{{ cinder_service_v2_name }}"
service_type: "{{ cinder_service_v2_type }}" service_type: "{{ cinder_service_v2_type }}"
service_region: "{{ cinder_service_region }}" service_region: "{{ cinder_service_region }}"

13
templates/cinder.conf.j2
View File

@ -104,12 +104,15 @@ profiler_enabled = {{ cinder_profiler_enabled }}
trace_sqlalchemy = {{ cinder_profiler_trace_sqlalchemy }} trace_sqlalchemy = {{ cinder_profiler_trace_sqlalchemy }}
[keystone_authtoken] [keystone_authtoken]
auth_plugin = {{ cinder_keystone_auth_plugin }}
signing_dir = /var/cache/cinder signing_dir = /var/cache/cinder
identity_uri = {{ keystone_service_adminuri }} auth_url = {{ keystone_service_adminuri }}
auth_uri = {{ keystone_service_internalurl }} auth_uri = {{ keystone_service_internaluri }}
admin_tenant_name = {{ cinder_service_tenant_name }} project_domain_id = {{ cinder_service_project_domain_id }}
admin_user = {{ cinder_service_user_name }} user_domain_id = {{ cinder_service_user_domain_id }}
admin_password = {{ cinder_service_password }} project_name = {{ cinder_service_project_name }}
username = {{ cinder_service_user_name }}
password = {{ cinder_service_password }}
memcached_servers = {{ memcached_servers }} memcached_servers = {{ memcached_servers }}