openstack/charm-keystone
Code Issues Proposed changes

[heut2008,r=hopem]

Browse Source 
Fixes ldap-backend support. Default is to treat ldap as read-only
so if using ldap identity backend, admin-user and admin-role are
not created unles read-only is set to False.
This commit is contained in:
Edward Hope-Morley
2014-09-05 16:24:44 +01:00
parent 6e1c54736c d370dd83d8
commit 0c2a052ba0
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
hooks/keystone_utils.py
View File

@@ -480,13 +480,11 @@ def ensure_initial_admin(config):
cmd = ['pwgen', '-c', '16', '1']
passwd = str(subprocess.check_output(cmd)).strip()
open(STORED_PASSWD, 'w+').writelines("%s\n" % passwd)
create_user(config('admin-user'), passwd, tenant='admin')
update_user_password(config('admin-user'), passwd)
create_role(config('admin-role'), config('admin-user'), 'admin')
# TODO(adam_g): The following roles are likely not needed since redux merge
create_role("KeystoneAdmin", config("admin-user"), 'admin')
create_role("KeystoneServiceAdmin", config("admin-user"), 'admin')
# User is managed by ldap backend when using ldap identity
if not (config('identity-backend') == 'ldap' and config('ldap-readonly')):
create_user(config('admin-user'), passwd, tenant='admin')
update_user_password(config('admin-user'), passwd)
create_role(config('admin-role'), config('admin-user'), 'admin')
create_service_entry("keystone", "identity", "Keystone Identity Service")
for region in config('region').split():