Merge lp:~mthaddon/charms/precise/pgbouncer/package-holds into lp:charms/pgbouncer

[Tom Haddon]

Allow the pgbouncer package to be held with a config option. This allows us to stop the service from being automatically restarted if we're doing automated package updates in a production environment so we can co-ordinate any service restarts outside of automated updates

[Marco Ceppi (marcoceppi)]

LGTM +1

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2013-02-25 05:22:47 +0000
+++ config.yaml	2013-08-16 11:02:37 +0000
@@ -149,6 +149,12 @@
         type: string
         description: |
             What service this component forms part of. Used by nrpe.
+    package_status:
+        default: "install"
+        type: string
+        description: |
+            The status of service-affecting packages will be set to this value in the dpkg database.
+            Useful valid values are "install" and "hold".
     wait_warn:
          default: 5
          type: int

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2012-10-02 08:57:36 +0000
+++ hooks/config-changed	2013-08-16 11:02:37 +0000
@@ -11,5 +11,7 @@
 juju-log "Generating new pgbouncer configuration and init script"
 update_config
 
+ensure_package_status "${SERVICE_AFFECTING_PACKAGES}" $(config-get package_status)
+
 juju-log "Reloading pgbouncer"
 /usr/sbin/service pgbouncer reload

=== modified file 'hooks/db-proxy-relation-changed'
--- hooks/db-proxy-relation-changed	2013-03-22 14:30:59 +0000
+++ hooks/db-proxy-relation-changed	2013-08-16 11:02:37 +0000
@@ -113,8 +113,8 @@
 if [ "$JUJU_RELATION" != "db-proxy" ]; then
     # If called out of context
     juju-log "Out of db-proxy relation context, manually setting JUJU vars for db-proxy relation"
-    JUJU_RELATION="db-proxy"
-    export JUJU_RELATION_IDS=$(relation-ids db-proxy)
+    export JUJU_RELATION="db-proxy"
+    JUJU_RELATION_IDS=$(relation-ids db-proxy)
     UPDATED="False" 
     for JUJU_RELATION_ID in $(echo ${JUJU_RELATION_ID}); do
         export JUJU_REMOTE_UNIT=$(relation-list -r $JUJU_RELATION_ID)

=== modified file 'hooks/install'
--- hooks/install	2013-01-03 18:15:45 +0000
+++ hooks/install	2013-08-16 11:02:37 +0000
@@ -22,6 +22,8 @@
 juju-log "Installing packages via apt-get"
 apt-get -y install -- pgbouncer python-cheetah postgresql-client pwgen python-psycopg2
 
+ensure_package_status "${SERVICE_AFFECTING_PACKAGES}" $(config-get package_status)
+
 # Make sure pgbouncer is enabled and set max open files
 max_open_files=$(config-get max_open_files)
 cat  >/etc/default/pgbouncer << EOF

=== modified file 'scripts/common'
--- scripts/common	2013-02-27 03:43:44 +0000
+++ scripts/common	2013-08-16 11:02:37 +0000
@@ -7,6 +7,8 @@
 
 set -eux # -x for verbose logging to juju debug-log
 
+SERVICE_AFFECTING_PACKAGES="pgbouncer"
+
 update_config()
 {
 	pgbouncer_userlist=/etc/pgbouncer/userlist.txt
@@ -50,3 +52,19 @@
 	juju-log "reloading pgbouncer"
 	service pgbouncer reload || exit 1
 }
+
+ensure_package_status()
+{
+	packages="$1" ; shift
+	status="$1" ; shift
+
+	case $status in
+	install|hold)
+		for package in ${packages}; do
+			echo ${package} ${status}
+		done | dpkg --set-selections
+		;;
+	*)
+		;;
+	esac
+}