Merge lp:~thedac/charms/precise/daisy-retracer/scalingstack-changes into lp:~daisy-pluckers/charms/precise/daisy-retracer/trunk

[David Ames]

In the past we have dealt with python-keystoneclient and python-requests incompatibilities by holding the packages. IS is attempting to "unhold" as many packages as possible.

The solution is adding the ubuntu cloud archive repository (grizzly version for precise). Because the repository config option is already required for gathering daisy-dependencies. An "extra" repository is needed.

This MP adds the extra-repository config option. This will allow us to get updates for python-requests and python-keystoneclient without requiring these packages be held.

In addition the MP makes the retracer-amd64.log file age check configurable.

[Brian Murray (brian-murray)]

Looks good to me.

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2014-12-16 22:58:42 +0000
+++ config.yaml	2015-01-09 00:15:57 +0000
@@ -100,6 +100,10 @@
       type: string
       default: 'ppa:daisy-pluckers/daisy-seeds'
       description: The location for the daisy-dependencies package.
+  extra-repository:
+      type: string
+      default: 'deb http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/grizzly main'
+      description: Apt repository required for packages other than daisy-dependencies.
   duplicate-database:
       type: string
       default: 'porter-i386.canonical.com::whoopsie/apport_duplicates.db'
@@ -227,3 +231,13 @@
       description: |
         The status of service-affecting-packages will be set to this value in the dpkg database.
         Useful valid values are "install" and "hold".
+  nagios-log-file-age-warn:
+      default: 1800
+      type: int
+      description: |
+        The nagios check warn threshold for the retracer-amd64.log file age check in seconds.
+  nagios-log-file-age-crit:
+      default: 3600
+      type: int
+      description: |
+        The nagios check critical threshold for the retracer-amd64.log file age check in seconds.

=== modified file 'hooks/common'
--- hooks/common	2014-12-19 21:45:37 +0000
+++ hooks/common	2015-01-09 00:15:57 +0000
@@ -30,6 +30,9 @@
 SANDBOX="$(config-get sandbox)"
 CLEANUP_SANDBOX="$(config-get cleanup-sandbox)"
 CLEANUP_DEBS="$(config-get cleanup-debs)"
+LOG_FILE_AGE_WARN="$(config-get nagios-log-file-age-warn)"
+LOG_FILE_AGE_CRIT="$(config-get nagios-log-file-age-crit)"
+EXTRA_REPOSITORY="$(config-get extra-repository)"
 
 if [ "$CACHE_DEBS" = "False" ]; then
     CACHE_DEBS="--nocache-deb"
@@ -235,7 +238,7 @@
     # Check only the amd64 log for recent activity.
     export SERVICE_DESCRIPTION="Daisy retracer amd64 log check"
     export NRPE_CMD_NAME="check_ue_daisy_retracer_amd64_${INSTANCE_TYPE}_log_check"
-    export NRPE_CMD="/usr/lib/nagios/plugins/check_file_age -w 900 -c 1800 -f /srv/${BASEDIR}/${INSTANCE_TYPE}-logs/retracer-amd64.log"
+    export NRPE_CMD="/usr/lib/nagios/plugins/check_file_age -w $LOG_FILE_AGE_WARN -c $LOG_FILE_AGE_CRIT -f /srv/${BASEDIR}/${INSTANCE_TYPE}-logs/retracer-amd64.log"
     cheetah fill --env -p templates/nrpe_cmd_file.tmpl > /etc/nagios/nrpe.d/${NRPE_CMD_NAME}.cfg
     cheetah fill --env -p templates/nrpe_service_file.tmpl > /var/lib/nagios/export/service__${NAGIOS_HOSTNAME}_${NRPE_CMD_NAME}.cfg
     

=== modified file 'hooks/install'
--- hooks/install	2014-07-14 21:14:29 +0000
+++ hooks/install	2015-01-09 00:15:57 +0000
@@ -16,6 +16,9 @@
 
 . hooks/common
 
+if [ -n "$EXTRA_REPOSITORY" ]; then
+    add-apt-repository "$EXTRA_REPOSITORY"
+fi
 add-apt-repository "$(config-get repository)"
 apt-get update
 apt-get install -y retracer-dependencies python-distro-info

=== modified file 'hooks/upgrade-charm'
--- hooks/upgrade-charm	2014-12-09 21:28:27 +0000
+++ hooks/upgrade-charm	2015-01-09 00:15:57 +0000
@@ -5,6 +5,9 @@
 charm_dir="$(pwd)"
 deploy_code "$charm_dir/files/daisy.tgz" $CODE_LOCATION $DAISY_CODE_DIRS
 
+if [ -n "$EXTRA_REPOSITORY" ]; then
+    add-apt-repository "$EXTRA_REPOSITORY"
+fi
 sudo apt-get update
 DEBCONF_FRONTEND=noninteractive sudo apt-get -y install oops-repository retracer-dependencies