Merge lp:~thedac/charms/precise/errors/fix-multiple-app-server-races into lp:~daisy-pluckers/charms/precise/errors/trunk

[David Ames]

Fix problems with multiple appservers.
Use role account for db ownership.
Wait for allowed-hosts to be set on the relation before proceeding

=== modified file 'config.yaml'
--- config.yaml	2014-03-19 17:16:45 +0000
+++ config.yaml	2014-03-28 23:33:54 +0000
@@ -58,6 +58,11 @@
       default: 'credentials_cache'
       description: |
         The name of the database to store OpenID credential information in.
+  credentials-database-role:
+      type: string
+      default: 'credentials_cache'
+      description: |
+        The role name that will own the database.
   repository:
       type: string
       default: 'ppa:daisy-pluckers/daisy-seeds'
 
=== modified file 'hooks/postgres'
--- hooks/postgres	2014-03-12 18:57:37 +0000
+++ hooks/postgres	2014-03-28 23:33:54 +0000
@@ -6,13 +6,22 @@
 DATABASE="$(relation-get database)"
 HOST="$(relation-get host)"
 PASSWORD="$(relation-get password)"
+ALLOWED_UNITS="$(relation-get allowed-units)"
 
 if [ -z "$DATABASE" ]; then
-    relation-set database="$(config-get credentials-database-name)"
+    relation-set database="$(config-get credentials-database-name)" role="$(config-get credentials-database-role)"
     exit 0
 fi
 
-[ -n "$USER" ] || exit 0
+if [[ -z "$ALLOWED_UNITS" ]]; then
+   echo "ALLOWED_UNITS not yet set"
+   exit 0
+fi
+if [[ "$ALLOWED_UNITS" != *${JUJU_UNIT_NAME}* ]]; then
+   echo "$JUJU_UNIT_NAME not in $ALLOWED_UNITS"
+   exit 0
+fi
+
 
 if [ ! -e "$POSTGRES_CONFIG_PATH" ]; then
     cat > "$POSTGRES_CONFIG_PATH" << EOF