openstack/charm-keystone
Code Issues Proposed changes

Final sync

Browse Source
This commit is contained in:
James Page 2014-04-10 16:51:03 +01:00
parent 9024125dce
commit 7cc221cd08
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -148,7 +148,7 @@ class SharedDBContext(OSContextGenerator):
'database': self.database,
'database_user': self.user,
'database_password': rdata.get(password_setting),
'database_type': 'mysql',
'database_type': 'mysql'
}
if context_complete(ctxt):
db_ssl(rdata, ctxt, self.ssl_dir)
@ -181,7 +181,7 @@ class PostgresqlDBContext(OSContextGenerator):
'database_type': 'postgresql',
}
if context_complete(ctxt):
return ctxt
return ctxt
return {}
@ -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'),