Merge lp:~stub/charms/precise/postgresql-psql/devel into lp:charms/postgresql-psql

[Stuart Bishop]

The PostgreSQL charm had an (until now) undocumented 'roles' parameter on the relation. This parameter specifies a list of roles that PostgreSQL should grant a newly created user.

This branch adds support for setting this parameter on the psql service.

[Marco Ceppi (marcoceppi)]

LGTM +1

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2013-05-07 07:01:22 +0000
+++ config.yaml	2013-12-23 10:26:33 +0000
@@ -5,3 +5,9 @@
     description: |
         Database to connect 'db' relationships to, overriding the
         generated default database name.
+  roles:
+    default: ""
+    type: string
+    description: |
+        Comma separated list of roles for PostgreSQL to grant to the database
+        user.

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2013-08-23 11:43:56 +0000
+++ hooks/hooks.py	2013-12-23 10:26:33 +0000
@@ -57,11 +57,22 @@
 
     for _, relid, unit, relation in all_relations(relation_types=['db']):
         log("{} {} {!r}".format(relid, unit, relation), DEBUG)
-        if config['database'] and relation['database'] != config['database']:
-            log("Overriding generated database {} with {}".format(
-                relation['database'], config['database']), INFO)
-            hookenv.relation_set(relid, database=config['database'])
-        elif 'user' in relation:
+
+        def_str = '<DEFAULT>'
+        if config['database'] != relation.get('database', ''):
+            log("Switching from database {} to {}".format(
+                relation.get('database', '') or def_str,
+                config['database'] or def_str), INFO)
+
+        if config['roles'] != relation.get('roles', ''):
+            log("Updating granted roles from {} to {}".format(
+                relation.get('roles', '') or def_str,
+                config['roles'] or def_str))
+
+        hookenv.relation_set(
+            relid, database=config['database'], roles=config['roles'])
+
+        if 'user' in relation:
             rebuild_relation(relid, unit, relation)
 
     for _, relid, unit, relation in all_relations(relation_types=['db-admin']):