From cb381b90bd20551354e6ce5b0a99c836a3f777f5 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Tue, 30 Apr 2013 10:38:04 +0100 Subject: [PATCH] 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 --- heat/api/aws/ec2token.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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): -- 2.45.2