Merge lp:~gandelman-a/charms/precise/keystone/config-changed into lp:~charmers/charms/precise/keystone/trunk

[Adam Gandelman]

[Mark Mims (mark-mims)]

lgtm

review: Approve

=== modified file 'hooks/keystone-hooks'
--- hooks/keystone-hooks	2012-04-14 00:24:56 +0000
+++ hooks/keystone-hooks	2012-08-08 23:20:23 +0000
@@ -230,12 +230,16 @@
     }
     relation_set(relation_data)
 
+def config_changed():
+    ensure_initial_admin(config)
+
 hooks = {
     "install": install_hook,
     "shared-db-relation-joined": db_joined,
     "shared-db-relation-changed": db_changed,
     "identity-service-relation-joined": identity_joined,
-    "identity-service-relation-changed": identity_changed
+    "identity-service-relation-changed": identity_changed,
+    "config-changed": config_changed
 }
 
 # keystone-hooks gets called by symlink corresponding to the requested relation
 
=== modified file 'hooks/utils.py'
--- hooks/utils.py	2012-03-02 20:46:20 +0000
+++ hooks/utils.py	2012-08-08 23:20:23 +0000
@@ -371,6 +371,7 @@
     """
     create_tenant("admin")
     create_tenant(config["service-tenant"])
+
     passwd = ""
     if config["admin-password"] != "None":
         passwd = config["admin-password"]
@@ -383,6 +384,7 @@
         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')
@@ -395,3 +397,16 @@
     internal_url = "http://%s:%s/v2.0" % (config["hostname"], config["service-port"])
     create_endpoint_template("RegionOne", "keystone", public_url,
                              admin_url, internal_url)
+
+def update_user_password(username, password):
+    import manager
+    manager = manager.KeystoneManager(endpoint='http://localhost:35357/v2.0/',
+                                      token=get_admin_token())
+    juju_log("Updating password for user '%s'" % username)
+
+    user_id = manager.resolve_user_id(username)
+    if user_id is None:
+        error_out("Could not resolve user id for '%s'" % username)
+
+    manager.api.users.update_password(user=user_id, password=password)
+    juju_log("Successfully updated password for user '%s'" % username)
 
=== modified file 'revision'
--- revision	2012-03-08 22:38:36 +0000
+++ revision	2012-08-08 23:20:23 +0000
@@ -1,1 +1,1 @@
-138
+140