Merge lp:~aglenyoung/charms/precise/rabbitmq-server/nrpe-master-hooks into lp:charms/rabbitmq-server

[Andrew Glen-Young]

Add support for the nrpe-external-master subordinate, add preinstall and upgrade hook.

[Adam Gandelman (gandelman-a)]

Andrew- LGTM, merged. We're gonna need to commit similar changes in python to the pending branch lp:~openstack-charmers/charms/precise/rabbitmq-server/ha-support which should be merging into the upstream charm soon. Any chance you could propose a patch there? If not I'll take care of it when that stuff goes upstream.

=== modified file 'config.yaml'
--- config.yaml	2012-11-21 15:30:39 +0000
+++ config.yaml	2013-03-01 17:39:24 +0000
@@ -17,3 +17,13 @@
   ssl_cert:
     type: string
     description: X.509 certificate in PEM format (starts "-----BEGIN CERTIFICATE-----")
+  nagios_context:
+    default: "juju"
+    type: string
+    description: |
+      Used by the nrpe-external-master subordinate charm.
+      A string that will be prepended to instance name to set the host name
+      in nagios. So for instance the hostname would be something like:
+          juju-myservice-0
+      If you're running multiple environments with the same services in them
+      this allows you to differentiate between them.

=== modified file 'hooks/rabbitmq-relations'
--- hooks/rabbitmq-relations	2012-11-21 14:47:12 +0000
+++ hooks/rabbitmq-relations	2013-03-01 17:39:24 +0000
@@ -33,6 +33,8 @@
 juju-log "rabbitmq-server: Firing hook $ARG0."
 
 function install_hook() {
+  [ -d exec.d ] && ( for f in exec.d/*/charm-pre-install; do [ -x $f ] && /bin/sh -c "$f";done )
+
   [[ ! `which pwgen` ]] && apt-get -y install pwgen
   DEBIAN_FRONTEND=noninteractive apt-get -qqy \
     install --no-install-recommends rabbitmq-server
@@ -41,6 +43,10 @@
   open-port 5672/tcp
 }
 
+function upgrade_charm {
+  [ -d exec.d ] && ( for f in exec.d/*/charm-pre-install; do [ -x $f ] && /bin/sh -c "$f";done )
+}  
+
 function amqp_changed() {
   # Connecting clients should request a username and vhost.
   # In reponse, we generate a password for new users,
@@ -109,6 +115,7 @@
   "install") install_hook ;;
   "start") service rabbitmq-server status || service rabbitmq-server start ;;
   "stop") service rabbitmq-server status && service rabbitmq-server stop ;;
+  "upgrade-charm") upgrade_charm ;;
   "amqp-relation-joined") exit 0 ;;
   "amqp-relation-changed") amqp_changed ;;
   "cluster-relation-joined") cluster_joined ;;

=== added symlink 'hooks/upgrade-charm'
=== target is u'rabbitmq-relations'
=== modified file 'metadata.yaml'
--- metadata.yaml	2012-05-29 23:08:45 +0000
+++ metadata.yaml	2013-03-01 17:39:24 +0000
@@ -8,6 +8,9 @@
 provides:
   amqp:
     interface: rabbitmq
+  nrpe-external-master:
+    interface: nrpe-external-master
+    scope: container
 peers:
   cluster:
     interface: rabbitmq