Merge "Move auth_token configurations to quantum.conf"

This commit is contained in:
Jenkins 2013-02-11 20:02:22 +00:00 committed by Gerrit Code Review
commit bbef9ab0ac
2 changed files with 9 additions and 7 deletions

View File

@ -13,13 +13,6 @@ paste.filter_factory = quantum.auth:QuantumKeystoneContext.factory
[filter:authtoken]
paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
auth_host = 127.0.0.1
auth_port = 35357
auth_protocol = http
admin_tenant_name = %SERVICE_TENANT_NAME%
admin_user = %SERVICE_USER%
admin_password = %SERVICE_PASSWORD%
signing_dir = /var/lib/quantum/keystone-signing
[filter:extensions]
paste.filter_factory = quantum.api.extensions:plugin_aware_extension_middleware_factory

View File

@ -207,3 +207,12 @@ notification_topics = notifications
# root filter facility.
# Change to "sudo" to skip the filtering and just run the comand directly
# root_helper = sudo
[keystone_authtoken]
auth_host = 127.0.0.1
auth_port = 35357
auth_protocol = http
admin_tenant_name = %SERVICE_TENANT_NAME%
admin_user = %SERVICE_USER%
admin_password = %SERVICE_PASSWORD%
signing_dir = /var/lib/quantum/keystone-signing