openstack/charm-neutron-gateway
Code Issues Proposed changes

Final resync

Browse Source
This commit is contained in:
James Page 2014-04-10 17:43:14 +01:00
parent 86b3efffdc
commit 917650f547
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hooks/charmhelpers/contrib/openstack/context.py
View File

@ -234,6 +234,10 @@ class IdentityServiceContext(OSContextGenerator):
rdata.get('auth_protocol') or 'http',
}
if context_complete(ctxt):
# NOTE(jamespage) this is required for >= icehouse
# so a missing value just indicates keystone needs
# upgrading
ctxt['admin_tenant_id'] = rdata.get('service_tenant_id')
return ctxt
return {}

1
hooks/charmhelpers/contrib/openstack/utils.py
View File

@ -65,6 +65,7 @@ SWIFT_CODENAMES = OrderedDict([
('1.10.0', 'havana'),
('1.9.1', 'havana'),
('1.9.0', 'havana'),
('1.13.1', 'icehouse'),
('1.13.0', 'icehouse'),
('1.12.0', 'icehouse'),
('1.11.0', 'icehouse'),