From c910b470e61a35230bc7ddaced13c3d51fac32fd Mon Sep 17 00:00:00 2001
From: andy <github@anarkystic.com>
Date: Thu, 24 Jun 2010 04:11:53 +0100
Subject: re-added cloudpipe

Conflicts:

	bin/nova-manage
	nova/auth/users.py
	nova/compute/network.py
---
 nova/endpoint/api.py | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'nova/endpoint')

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),
-- 
cgit