diff options
| author | andy <github@anarkystic.com> | 2010-06-24 04:11:53 +0100 |
|---|---|---|
| committer | andy <github@anarkystic.com> | 2010-06-24 04:11:53 +0100 |
| commit | c910b470e61a35230bc7ddaced13c3d51fac32fd (patch) | |
| tree | 2ba07dda547a228581ddb98a0391d5a39de08353 /nova/endpoint | |
| parent | 6dc4d23e01d1fcd8aa27d34d8b3b2cba5eac9573 (diff) | |
re-added cloudpipe
Conflicts:
bin/nova-manage
nova/auth/users.py
nova/compute/network.py
Diffstat (limited to 'nova/endpoint')
| -rwxr-xr-x | nova/endpoint/api.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/nova/endpoint/api.py b/nova/endpoint/api.py index e70694210..977daff27 100755 --- a/nova/endpoint/api.py +++ b/nova/endpoint/api.py @@ -37,6 +37,7 @@ from nova import flags from nova import utils from nova.endpoint import cloud from nova.auth import users +import nova.cloudpipe.api FLAGS = flags.FLAGS flags.DEFINE_integer('cc_port', 8773, 'cloud controller port') @@ -322,6 +323,8 @@ class APIServerApplication(tornado.web.Application): def __init__(self, user_manager, controllers): tornado.web.Application.__init__(self, [ (r'/', RootRequestHandler), + (r'/cloudpipe/(.*)', nova.cloudpipe.api.CloudPipeRequestHandler), + (r'/cloudpipe', nova.cloudpipe.api.CloudPipeRequestHandler), (r'/services/([A-Za-z0-9]+)/', APIRequestHandler), (r'/latest/([-A-Za-z0-9/]*)', MetadataRequestHandler), (r'/2009-04-04/([-A-Za-z0-9/]*)', MetadataRequestHandler), |