From: Steven Hardy <shardy@redhat.com>
Date: Tue, 30 Apr 2013 09:38:04 +0000 (+0100)
Subject: heat api: fix ec2token authentication
X-Git-Tag: 2014.1~683^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=cb381b90bd20551354e6ce5b0a99c836a3f777f5;p=openstack-build%2Fheat-build.git

heat api: fix ec2token authentication

Since the change merged from https://review.openstack.org/#/c/27383/
ec2token auth no longer works, because there is a mismatch between
the config file section name and the section specified in ec2token

fixes bug #1174673

Change-Id: I5c0465de5c023f587b677b10717ca3a08ba411b7
---

diff --git a/heat/api/aws/ec2token.py b/heat/api/aws/ec2token.py
index 173ea788..1382fd1b 100644
--- a/heat/api/aws/ec2token.py
+++ b/heat/api/aws/ec2token.py
@@ -35,7 +35,7 @@ opts = [
     cfg.StrOpt('auth_uri', default=None),
     cfg.StrOpt('keystone_ec2_uri', default=None)
 ]
-cfg.CONF.register_opts(opts, group='ec2token')
+cfg.CONF.register_opts(opts, group='ec2authtoken')
 
 
 class EC2Token(wsgi.Middleware):
@@ -50,7 +50,7 @@ class EC2Token(wsgi.Middleware):
         if name in self.conf:
             return self.conf[name]
         else:
-            return cfg.CONF.ec2token[name]
+            return cfg.CONF.ec2authtoken[name]
 
     @webob.dec.wsgify(RequestClass=wsgi.Request)
     def __call__(self, req):