openstack
/
heat
Code Issues Proposed changes

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
This commit is contained in:
Steven Hardy 2013-04-30 10:38:04 +01:00
parent 7ce9a214f0
commit cb381b90bd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
heat/api/aws/ec2token.py
View File

@ -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):