openstack/charm-heat
Code Issues Proposed changes

Lint tidy

Browse Source
This commit is contained in:
James Page 2016-02-10 13:29:21 +00:00
parent 128bddd53d
commit 33440cf21a
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hooks/heat_context.py
View File

@ -61,7 +61,8 @@ class HeatSecurityContext(context.OSContextGenerator):
# check if we have stored encryption key # check if we have stored encryption key
encryption = get_encryption_key() encryption = get_encryption_key()
ctxt['encryption_key'] = encryption ctxt['encryption_key'] = encryption
ctxt['heat_domain_admin_passwd'] = leader_get('heat-domain-admin-passwd') ctxt['heat_domain_admin_passwd'] = \
leader_get('heat-domain-admin-passwd')
return ctxt return ctxt

3
hooks/heat_utils.py
View File

@ -111,7 +111,8 @@ CONFIG_FILES = OrderedDict([
'services': ['apache2'], 'services': ['apache2'],
}), }),
(ADMIN_OPENRC, { (ADMIN_OPENRC, {
'contexts': [HeatIdentityServiceContext(service=SVC, service_user=SVC)], 'contexts': [HeatIdentityServiceContext(service=SVC,
service_user=SVC)],
'services': [] 'services': []
}), }),
]) ])