Use cinder.conf for auth_token configs.
Updates the cinder element so that we use the application config file (cinder.conf) instead of the Cinder api-paste.ini config file. Related-Bug: #1240753 Change-Id: I6636d33ee522757145ac97fc354324a8b9379700
This commit is contained in:
parent
e63751ae7c
commit
c47f9bd196
@ -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}}
|
|
||||||
|
@ -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}}
|
||||||
|
Loading…
Reference in New Issue
Block a user