Merge lp:~dspiteri/charms/precise/cassandra/prodchanges into lp:charms/cassandra

[Darren Spiteri]

Merging from prod.

[Mark Mims (mark-mims)]

lgtm

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2013-07-12 11:57:40 +0000
+++ config.yaml	2013-08-13 07:34:06 +0000
@@ -142,3 +142,10 @@
         type: int
         description: |
             The pct of heap used to trigger a nagios critcal alert
+
+    extra_packages:
+	type: string
+	default: ""
+	description: |
+            Extra packages to install. A space delimited list of packages.
+

=== modified file 'hooks/cassandra-common'
--- hooks/cassandra-common	2013-07-18 20:31:35 +0000
+++ hooks/cassandra-common	2013-08-13 07:34:06 +0000
@@ -29,8 +29,9 @@
 bzr_ci () {
   local msg=${FUNCNAME[1]}
   test -n "$1" && msg="$1"
-  bzr st /etc/cassandra|egrep -q '^modified|added' || return 0
-  bzr ci -m "[$(date "+%Y-%m-%d %H:%M:%S")] ${JUJU_UNIT_NAME}: ${msg} auto-commit" /etc/cassandra || return 0
+  bzr st /etc/cassandra|egrep -q '^modified|added' || return 1
+  bzr ci -m "[$(date "+%Y-%m-%d %H:%M:%S")] ${JUJU_UNIT_NAME}: ${msg} auto-commit" /etc/cassandra || return 1
+  return 0
 }
 
 
@@ -48,6 +49,8 @@
   # Install the repository
   APT_REPO_SPEC="$(config-get apt-repo-spec)"
   APT_REPO_KEY=$(config-get apt-repo-key)
+  # Check for configured extra packages to install from config
+  EXTRA_PACKAGES="$(config-get extra_packages)"
   # Add the key
   if [[ -n "${APT_REPO_KEY}" ]]; then
     apt-key adv --keyserver keyserver.ubuntu.com --recv-keys ${APT_REPO_KEY}
@@ -56,12 +59,13 @@
     echo "${APT_REPO_SPEC}" > /etc/apt/sources.list.d/cassandra.list
   fi
   # Update the repositories
+
   apt-get update
   # Ensure that cassandra does not startup before we have configured it
   disable_cassandra_start
   # Install the package
-  DEBIAN_FRONTEND=noninteractive apt-get -qq install -y cassandra python-cheetah dnsutils bzr
-  bzr_ci
+  DEBIAN_FRONTEND=noninteractive apt-get -qq install -y cassandra python-cheetah dnsutils bzr ${EXTRA_PACKAGES}
+  bzr_ci || :
 }
 
 # Update the cassandra environment with the appropriate JMX port
@@ -71,7 +75,6 @@
   test -n "${JMX_PORT}" || return 1
   test ${JMX_PORT} -gt 0 -a ${JMX_PORT} -lt 65535 || return 1
   sed -i -e "s/^JMX_PORT=.*/JMX_PORT=\"${JMX_PORT}\"/" /etc/cassandra/cassandra-env.sh
-  bzr_ci
   # Open port ready for expose
   open-port ${JMX_PORT}/TCP
 }
@@ -240,7 +243,6 @@
     sed -i -e "s/^[#]MAX_HEAP_SIZE=.*/#MAX_HEAP_SIZE=\"${HEAP_SIZE}\"/" \
            -e "s/^[#]HEAP_NEWSIZE=.*/#HEAP_NEWSIZE=\"${NEW_GEN_SIZE}\"/" /etc/cassandra/cassandra-env.sh
   fi 
-  bzr_ci
 }
 
 # Service Control Commands
@@ -281,7 +283,7 @@
     sed -i -e "s/\- seeds:.*/\- seeds: \"${seeds}\"/" /etc/cassandra/cassandra.yaml
   fi
   juju-log "$JUJU_REMOTE_UNIT modified its settings or departed"
-  bzr_ci
+  bzr_ci || :
 }
 
 nodestatus() {
@@ -385,20 +387,27 @@
     # Initialize /etc/cassandra bzr
     bzr whoami "${JUJU_UNIT_NAME} <juju@${HOSTNAME}>"
     test -d /etc/cassandra/.bzr || bzr init /etc/cassandra && bzr add /etc/cassandra
-    bzr_ci "main:${COMMAND}" /etc/cassandra
+    bzr_ci "main:${COMMAND}" /etc/cassandra || :
     # Update the cassandra environment with the appropriate JMX port
     configure_jmx_port 
+    bzr_ci || :
     # Construct the cassandra.yaml file from the appropriate information above
     configure_cassandra 
+    bzr_ci || :
     run_exec_d_hooks "post-install"
     ;;
   config-changed)
+    needs_restart=
     # Update the cassandra environment with the appropriate JMX port
     configure_jmx_port 
+    bzr_ci && needs_restart=:
     # Construct the cassandra.yaml file from the appropriate information above
     configure_cassandra
-    # Restart as required
-    restart_cassandra
+    bzr_ci && needs_restart=:
+    if [ $needs_restart ]; then
+      # Restart as required
+      restart_cassandra
+    fi
     # Fill in nagios checks
     update_nagios_checks
     ;;