Juju Charms Collection
keystone package

Merge lp:~heut2008/charms/trusty/keystone/ldap-support-backend into lp:~openstack-charmers-archive/charms/trusty/keystone/next

  1. Trusty Tahr (14.04)
  2. ldap-support-backend
  3. Merge into next
Proposed by Yaguang Tang
Status: Merged
Approved by: Edward Hope-Morley
Approved revision: 69
Merged at revision: 78
Proposed branch: lp:~heut2008/charms/trusty/keystone/ldap-support-backend
Merge into: lp:~openstack-charmers-archive/charms/trusty/keystone/next
Diff against target: 22 lines (+5/-7)
1 file modified
hooks/keystone_utils.py (+5/-7)
To merge this branch: bzr merge lp:~heut2008/charms/trusty/keystone/ldap-support-backend
Reviewer Review Type Date Requested Status
Edward Hope-Morley Approve
OpenStack Charmers Pending
Review via email: mp+233471@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Edward Hope-Morley (hopem) wrote :

LGTM, tests pass.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/keystone_utils.py'
2--- hooks/keystone_utils.py 2014-07-29 07:42:45 +0000
3+++ hooks/keystone_utils.py 2014-09-05 08:26:15 +0000
4@@ -480,13 +480,11 @@
5 cmd = ['pwgen', '-c', '16', '1']
6 passwd = str(subprocess.check_output(cmd)).strip()
7 open(STORED_PASSWD, 'w+').writelines("%s\n" % passwd)
8-
9- create_user(config('admin-user'), passwd, tenant='admin')
10- update_user_password(config('admin-user'), passwd)
11- create_role(config('admin-role'), config('admin-user'), 'admin')
12- # TODO(adam_g): The following roles are likely not needed since redux merge
13- create_role("KeystoneAdmin", config("admin-user"), 'admin')
14- create_role("KeystoneServiceAdmin", config("admin-user"), 'admin')
15+ # User is managed by ldap backend when using ldap identity
16+ if not (config('identity-backend') == 'ldap' and config('ldap-readonly')):
17+ create_user(config('admin-user'), passwd, tenant='admin')
18+ update_user_password(config('admin-user'), passwd)
19+ create_role(config('admin-role'), config('admin-user'), 'admin')
20 create_service_entry("keystone", "identity", "Keystone Identity Service")
21
22 for region in config('region').split():

Subscribers

People subscribed via source and target branches