From: Steven Hardy <shardy@redhat.com>
Date: Tue, 14 Aug 2012 14:56:13 +0000 (+0100)
Subject: heat api : bugfix, save config correctly in EC2Token
X-Git-Tag: 2014.1~1537
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=ff967194048e1e579db210ddad2df3af49ec1430;p=openstack-build%2Fheat-build.git

heat api : bugfix, save config correctly in EC2Token

Fix issue where EC2Token fails to save the config correctly,
which breaks AWS Authentication

Fixes #191

Change-Id: I77dfe182aac81c55b7d487d88073b40eac1faadd
Signed-off-by: Steven Hardy <shardy@redhat.com>
---

diff --git a/heat/api/v1/ec2token.py b/heat/api/v1/ec2token.py
index cd47db8c..58b8869b 100644
--- a/heat/api/v1/ec2token.py
+++ b/heat/api/v1/ec2token.py
@@ -38,8 +38,8 @@ logger = logging.getLogger(__name__)
 class EC2Token(wsgi.Middleware):
     """Authenticate an EC2 request with keystone and convert to token."""
 
-    def __init__(self, app, conf, **local_conf):
-        self.conf = local_conf
+    def __init__(self, app, conf):
+        self.conf = conf
         self.application = app
 
     @webob.dec.wsgify(RequestClass=wsgi.Request)