From 01afc61e6201ea22926f27e82280f0b3c6f2362f Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Wed, 30 Nov 2011 08:27:33 +0000 Subject: Remove unused ec2.action_args These args are now just part of APIRequest since commit 2491c2484. Change-Id: I5983681d993735bd8891dc3a6a3a3530d41a6790 --- nova/api/ec2/__init__.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py index 100837631..23042dab0 100644 --- a/nova/api/ec2/__init__.py +++ b/nova/api/ec2/__init__.py @@ -256,7 +256,6 @@ class Requestify(wsgi.Middleware): api_request = apirequest.APIRequest(self.controller, action, req.params['Version'], args) req.environ['ec2.request'] = api_request - req.environ['ec2.action_args'] = args return self.application @@ -345,9 +344,8 @@ class Executor(wsgi.Application): """Execute an EC2 API request. - Executes 'ec2.action' upon 'ec2.controller', passing 'nova.context' and - 'ec2.action_args' (all variables in WSGI environ.) Returns an XML - response, or a 400 upon failure. + Executes 'ec2.request', passing 'nova.context' (both variables in WSGI + environ.) Returns an XML response, or a 400 upon failure. """ @webob.dec.wsgify(RequestClass=wsgi.Request) -- cgit