summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorSandy Walsh <sandy.walsh@rackspace.com>2011-03-16 19:04:27 -0700
committerSandy Walsh <sandy.walsh@rackspace.com>2011-03-16 19:04:27 -0700
commitc9158dfcf4efd2cf22df9aed7b1bb01e037e8eb2 (patch)
tree70525af2ba2c0e3139849566f2eb3774958e1de4 /nova/api
parent4d057c9c2df77816ead6f30fa2795148aa8148d3 (diff)
downloadnova-c9158dfcf4efd2cf22df9aed7b1bb01e037e8eb2.tar.gz
nova-c9158dfcf4efd2cf22df9aed7b1bb01e037e8eb2.tar.xz
nova-c9158dfcf4efd2cf22df9aed7b1bb01e037e8eb2.zip
moved scheduler API check into db.api decorator
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/zone_redirect.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/nova/api/zone_redirect.py b/nova/api/zone_redirect.py
index 0adf94046..4fe255c99 100644
--- a/nova/api/zone_redirect.py
+++ b/nova/api/zone_redirect.py
@@ -43,7 +43,7 @@ LOG = logging.getLogger('server')
class RequestForwarder(api.ChildZoneHelper):
-
+ """Worker for sending an OpenStack Request to each child zone."""
def __init__(self, resource, method, body):
self.resource = resource
self.method = method
@@ -98,10 +98,13 @@ class ZoneRedirectMiddleware(wsgi.Middleware):
scheme, netloc, path, query, frag = \
urlparse.urlsplit(req.path_qs)
query = urlparse.parse_qsl(query)
+ # Remove any cache busters from old novaclient calls ...
query = [(key, value) for key, value in query if key != 'fresh']
query = urllib.urlencode(query)
url = urlparse.urlunsplit((scheme, netloc, path, query, frag))
+ # Strip off the API version, since this is given when the
+ # child zone was added.
m = re.search('/v\d+\.\d+/(.+)', url)
resource = m.group(1)