summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorMichael Gundlach <michael.gundlach@rackspace.com>2010-09-02 15:43:55 -0400
committerMichael Gundlach <michael.gundlach@rackspace.com>2010-09-02 15:43:55 -0400
commitb360aded9cfeebfd7594b1b649bd2a1573203cd3 (patch)
tree5c672da6fb9422d0f50931a82b84b06830fb92d3 /nova/api
parent0fa141a231107da931c396f113b00329d63ee430 (diff)
downloadnova-b360aded9cfeebfd7594b1b649bd2a1573203cd3.tar.gz
nova-b360aded9cfeebfd7594b1b649bd2a1573203cd3.tar.xz
nova-b360aded9cfeebfd7594b1b649bd2a1573203cd3.zip
send requests to the main API instead of to the EC2 subset -- so that it can parse out the '/services/' prefix. Also, oops, match on path_info instead of path like we're supposed to.
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/ec2/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py
index a94bcb863..1722617ae 100644
--- a/nova/api/ec2/__init__.py
+++ b/nova/api/ec2/__init__.py
@@ -97,7 +97,7 @@ class Router(wsgi.Middleware):
def __call__(self, req):
# Obtain the appropriate controller and action for this request.
try:
- match = self.map.match(req.path)
+ match = self.map.match(req.path_info)
controller_name = match['controller_name']
controller = self.controllers[controller_name]
except: