Merge ~pjdc/ubuntu-mirror-charm/+git/ubuntu-mirror-charm:misc-nagios into ubuntu-mirror-charm:master

[Paul Collins]

configure_nrpe: reload nagios; check-mirror.sh: exit 2 so we get criticals

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[John Losito (jlosito)]

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 5b8cb8f4ffba955b570efdaf2d83beb65130be76

diff --git a/files/check-mirror.sh b/files/check-mirror.sh
index 78973d4..09c8b04 100755
--- a/files/check-mirror.sh
+++ b/files/check-mirror.sh
@@ -12,7 +12,7 @@ set -e
 if [ $# -lt 3 ] ; then
   echo "./check_mirror.sh [urlhost] [role] [ipaddrs]"
   echo "e.g., ./check_mirror.sh archive.ubuntu.com ubuntu 1.2.3.4 4.5.6.7 ..."
-  exit 1
+  exit 2
 fi
 
 urlhost=$1 ; shift
@@ -49,7 +49,7 @@ case ${role} in
         ;;
     *)
         echo "Unknown mirror role, ${role}"
-        exit 1
+        exit 2
 esac
 
 tmpsigned=${tmpdir}/$(basename ${signed})
diff --git a/hooks/hooks.py b/hooks/hooks.py
index cefbc5e..7e8af4f 100755
--- a/hooks/hooks.py
+++ b/hooks/hooks.py
@@ -22,8 +22,6 @@ from charmhelpers.core.host import (
     chownr,
     lsb_release,
     mkdir,
-    service_start,
-    service_stop,
     service_reload,
     service_restart,
     symlink,
@@ -688,6 +686,9 @@ def configure_nrpe():
     write_file(os.path.join(nagios_etcdir, 'check_all_disks_promptcrit.cfg'),
                check_all_disks)
 
+    log("CHARM: Reloading nagios-nrpe-server")
+    service_reload('nagios-nrpe-server')
+
 
 def configure_log_archiving():
     settings = {}