Merge lp:~joetalbott/charms/precise/postgresql/ensure_credentials_after_mount into lp:charms/postgresql

[Joe Talbott]

Ensure client credentials are up-to-date after an external mountpoint is mounted.

When using the block-storage-broker charm to have a persistent database the postgresql charm doesn't update the client credentials after the external mountpoint is mounted.

This patch iterates through client relations and ensures the expected users have access.

[Stuart Bishop (stub)]

Thanks for this work.

There are two minor problems with this:
1) Only the db relations are handled. db-admin relation also need to be done.
2) The passwords may have changed, since we likely don't have the plaintext around and create_user will reset them. The new passwords need to be set on the relation so the clients can react.

[Stuart Bishop (stub)]

I'll make these changes since they are relatively minor.

[Stuart Bishop (stub)]

review: Needs Fixing

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-06-16 09:38:33 +0000
+++ hooks/hooks.py	2014-09-18 14:58:23 +0000
@@ -940,6 +940,22 @@
         postgresql_data_dir, pg_version(), config_data['cluster_name']))
     update_service_port()
     update_nrpe_checks()
+
+    # Ensure client credentials match in the case that an external mountpoint
+    # has been mounted with an existing DB.
+    for relid in hookenv.relation_ids('db'):
+        rel = hookenv.relation_get(rid=relid, unit=hookenv.local_unit())
+
+        database = rel.get('database')
+        roles = filter(None, (rel.get('roles') or '').split(","))
+        user = rel['user']
+        password = create_user(user)
+        reset_user_roles(user, roles)
+        schema_user = rel['schema_user']
+        schema_password = create_user(schema_user)
+        if database is not None:
+            ensure_database(user, schema_user, database)
+
     if force_restart:
         postgresql_restart()
     postgresql_reload_or_restart()