Make sample quantum.conf compliant with docs

The module quantum_auth_token does not exist. Also, the documentation uses
authtoken instead of authN.

The docs, for reference: http://docs.openstack.org/incubation/openstack-network/admin/content/configuring-keystone-with-quantum.html

Change-Id: I5a225dd740bb654a0b27937ebfa68f0ef6bff4f8
This commit is contained in:
Francisco Souza 2012-04-12 09:32:50 -03:00
parent fc3cb0968d
commit c4af8f0625

View File

@ -26,27 +26,30 @@ use = egg:Paste#urlmap
[pipeline:quantumapi_v1_0] [pipeline:quantumapi_v1_0]
# By default, authentication is disabled. # By default, authentication is disabled.
# To enable Keystone integration uncomment the # To enable Keystone integration comment out the
# following line and comment the next one # following line and uncomment the next one
pipeline = extensions quantumapiapp_v1_0 pipeline = extensions quantumapiapp_v1_0
#pipeline = authN extensions quantumapiapp_v1_0 # pipeline = authtoken extensions quantumapiapp_v1_0
[pipeline:quantumapi_v1_1] [pipeline:quantumapi_v1_1]
# By default, authentication is disabled. # By default, authentication is disabled.
# To enable Keystone integration uncomment the # To enable Keystone integration comment out the
# following line and comment the next one # following line and uncomment the next one
pipeline = extensions quantumapiapp_v1_1 pipeline = extensions quantumapiapp_v1_1
#pipeline = authN extensions quantumapiapp_v1_1 # pipeline = authtoken extensions quantumapiapp_v1_1
[filter:authN] [filter:authtoken]
paste.filter_factory = keystone.middleware.quantum_auth_token:filter_factory paste.filter_factory = keystone.middleware.auth_token:filter_factory
auth_host = 127.0.0.1 auth_host = 127.0.0.1
auth_port = 35357 auth_port = 35357
auth_protocol = http auth_protocol = http
auth_version = 2.0 # auth_uri = http://127.0.0.1:5000/
auth_admin_user = admin admin_tenant_name = service
auth_admin_password = secrete admin_user = nova
#auth_admin_token = <token-value> admin_password = sp
# admin_token = 9a82c95a-99e9-4c3a-b5ee-199f6ba7ff04
# memcache_servers = 127.0.0.1:11211
# token_cache_time = 300
[filter:extensions] [filter:extensions]
paste.filter_factory = quantum.extensions.extensions:plugin_aware_extension_middleware_factory paste.filter_factory = quantum.extensions.extensions:plugin_aware_extension_middleware_factory