Skip to content

Commit

Permalink
Move auth_token configurations to quantum.conf
Browse files Browse the repository at this point in the history
keystone auth_token middleware now allows quantum to have auth_token
configuration in quantum.conf. This commit moves the example of
auth_token configuration from api-paste.ini to quantum.conf.
This simplifies user configuations and users is no longer required
to edit api-paste.ini.

This change does not break backward compatibility. auth_token first
tries the configurations in /etc/quantum/api-paste.ini and then the
above configurations. Thus a user who already use api-paste.ini
does not need to change it.

DocImpact

Change-Id: I5a4c48b14428e29ea2a331880e1de0afd69c97b5
  • Loading branch information
amotoki committed Feb 11, 2013
1 parent b6cf408 commit 859bf95
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
7 changes: 0 additions & 7 deletions etc/api-paste.ini
Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions etc/quantum.conf
Expand Up @@ -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

0 comments on commit 859bf95

Please sign in to comment.