Merging keystone.auth_protocols package into keystone.middleware

This commit is contained in:
Dolph Mathews 2011-07-18 10:39:33 -05:00
parent f9607a37b3
commit 48962d3049
10 changed files with 10 additions and 10 deletions

View File

@ -10,7 +10,7 @@ RUNNING THE TEST SERVICE (Echo.py):
$ ./echod --remote
in separate session
$ cd keystone/auth_protocols
$ cd keystone/middleware
$ python auth_token.py

View File

@ -20,7 +20,7 @@ pipeline =
echo
[filter:tokenauth]
paste.filter_factory = keystone.auth_protocols.auth_token:filter_factory
paste.filter_factory = keystone.middleware.auth_token:filter_factory
;where to find the token auth service
auth_host = 127.0.0.1
auth_port = 5001
@ -30,7 +30,7 @@ auth_protocol = http
admin_token = 999888777666
[filter:basicauth]
paste.filter_factory = keystone.auth_protocols.auth_basic:filter_factory
paste.filter_factory = keystone.middleware.auth_basic:filter_factory
[filter:openidauth]
paste.filter_factory = keystone.auth_protocols.auth_openid:filter_factory
paste.filter_factory = keystone.middleware.auth_openid:filter_factory

View File

@ -20,7 +20,7 @@ pipeline =
echo
[filter:tokenauth]
paste.filter_factory = keystone.auth_protocols.auth_token:filter_factory
paste.filter_factory = keystone.middleware.auth_token:filter_factory
;where to find the token auth service
auth_host = 127.0.0.1
auth_port = 5001
@ -30,7 +30,7 @@ auth_protocol = http
admin_token = 999888777666
[filter:basicauth]
paste.filter_factory = keystone.auth_protocols.auth_basic:filter_factory
paste.filter_factory = keystone.middleware.auth_basic:filter_factory
[filter:openidauth]
paste.filter_factory = keystone.auth_protocols.auth_openid:filter_factory
paste.filter_factory = keystone.middleware.auth_openid:filter_factory

View File

@ -83,7 +83,7 @@ paste.filter_factory = nova.api.openstack:FaultWrapper.factory
paste.filter_factory = nova.api.openstack.auth:AuthMiddleware.factory
[filter:tokenauth]
paste.filter_factory = keystone.auth_protocols.auth_token:filter_factory
paste.filter_factory = keystone.middleware.auth_token:filter_factory
service_protocol = http
service_host = 127.0.0.1
service_port = 808
@ -93,7 +93,7 @@ auth_protocol = http
admin_token = 999888777666
[filter:auth_shim]
paste.filter_factory = keystone.auth_protocols.nova_auth_token:KeystoneAuthShim.factory
paste.filter_factory = keystone.middleware.nova_auth_token:KeystoneAuthShim.factory
[filter:ratelimit]
paste.filter_factory = nova.api.openstack.limits:RateLimitingMiddleware.factory

View File

@ -59,7 +59,7 @@ setup(
'paste.filter_factory': [
'extfilter=keystone.middleware.url:filter_factory',
'remoteauth=keystone.middleware.remoteauth:remoteauth_factory',
'tokenauth=keystone.auth_protocols.auth_token:filter_factory',
'tokenauth=keystone.middleware.auth_token:filter_factory',
'swiftauth=keystone.middleware.swift_auth:filter_factory',
],
},