diff options
| author | Ziad Sawalha <github@highbridgellc.com> | 2011-05-23 19:04:04 -0500 |
|---|---|---|
| committer | Ziad Sawalha <github@highbridgellc.com> | 2011-05-23 19:04:04 -0500 |
| commit | 5cb71ca44d71417a7970d5b2a6bd9c2d2d09b69e (patch) | |
| tree | 93c6c115967f26b9e8bdd9bcf090acc9eb6a33f5 | |
| parent | 28c990171f484f508fba9bafe290c45cbe522c25 (diff) | |
| parent | 79f7346dd5cf10bff17183ee28378fa0e807c1a7 (diff) | |
| download | keystone-5cb71ca44d71417a7970d5b2a6bd9c2d2d09b69e.tar.gz keystone-5cb71ca44d71417a7970d5b2a6bd9c2d2d09b69e.tar.xz keystone-5cb71ca44d71417a7970d5b2a6bd9c2d2d09b69e.zip | |
Merge branch 'master' of https://github.com/khussein/keystone
| -rw-r--r-- | README.md | 9 | ||||
| -rw-r--r-- | docs/nova-api-paste.ini | 4 | ||||
| -rw-r--r-- | keystone/auth_protocols/nova_auth_token.py | 3 |
3 files changed, 8 insertions, 8 deletions
@@ -171,11 +171,10 @@ Initial support for using keystone as nova's identity component has been started bzr clone lp:nova git clone git://github.com/khussein/keystone.git - # copy keystone librarys into nova - cp keystone/keystone/common/bufferedhttp.py nova/nova/auth/ - cp keystone/keystone/auth_protocols/nova_auth_token.py nova/nova/auth/ + # link keystone into the nova root dir + ln -s keystone nova/keystone - # copy paste config to use nova_auth_token.py - cp keystone/docs/nova-api-paste.ini nova/etc/nova/api-paste.ini + # run nova-api based on the paste config in keystone + nova/bin/nova-api --api_paste_config=keystone/docs/nova-api-paste.ini Assuming you added the test data using bin/sampledata.sh, you can then use joeuser/secrete diff --git a/docs/nova-api-paste.ini b/docs/nova-api-paste.ini index e1c26a24..9786346c 100644 --- a/docs/nova-api-paste.ini +++ b/docs/nova-api-paste.ini @@ -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 = nova.auth.nova_auth_token:filter_factory +paste.filter_factory = keystone.auth_protocols.nova_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 = nova.auth.nova_auth_token:KeystoneAuthShim.factory +paste.filter_factory = keystone.auth_protocols.nova_auth_token:KeystoneAuthShim.factory [filter:ratelimit] paste.filter_factory = nova.api.openstack.limits:RateLimitingMiddleware.factory diff --git a/keystone/auth_protocols/nova_auth_token.py b/keystone/auth_protocols/nova_auth_token.py index 8dcaa25b..5d930d5d 100644 --- a/keystone/auth_protocols/nova_auth_token.py +++ b/keystone/auth_protocols/nova_auth_token.py @@ -54,7 +54,6 @@ HTTP_X_AUTHORIZATION: the client identity being passed in """ -from bufferedhttp import http_connect_raw as http_connect import eventlet import httplib import json @@ -72,6 +71,8 @@ import webob.dec from webob.exc import HTTPUnauthorized, HTTPUseProxy from webob.exc import Request, Response +from keystone.common.bufferedhttp import http_connect_raw as http_connect + FLAGS = flags.FLAGS PROTOCOL_NAME = "Token Authentication" |