openstack/tripleo-image-elements
Code Issues Proposed changes

Merge "Use cinder.conf for auth_token configs."

Browse Source
This commit is contained in:
Jenkins 2013-10-18 14:45:33 +00:00 committed by Gerrit Code Review
commit 79f66542dc
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
elements/cinder/os-config-applier/etc/cinder/api-paste.ini
View File

@ -50,12 +50,3 @@ paste.filter_factory = cinder.api.middleware.auth:CinderKeystoneContext.factory
[filter:authtoken] [filter:authtoken]
paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
service_protocol = http
service_host = {{keystone.host}}
service_port = 5000
auth_host = {{keystone.host}}
auth_port = 35357
auth_protocol = http
admin_tenant_name = service
admin_user = cinder
admin_password = {{cinder.service-password}}

11
elements/cinder/os-config-applier/etc/cinder/cinder.conf
View File

@ -28,3 +28,14 @@ qpid_port = 5672
qpid_username = {{username}} qpid_username = {{username}}
qpid_password = {{password}} qpid_password = {{password}}
{{/qpid}} {{/qpid}}
[keystone_authtoken]
service_protocol = http
service_host = {{keystone.host}}
service_port = 5000
auth_host = {{keystone.host}}
auth_port = 35357
auth_protocol = http
admin_tenant_name = service
admin_user = cinder
admin_password = {{cinder.service-password}}