[gnuoy,trivial] Pre-release charmhelper sync

2015-04-19 10:00:53 +01:00
parent 07db74254d
commit ebc2c22c64
1 changed files with 3 additions and 1 deletions
--- a/hooks/charmhelpers/contrib/charmsupport/nrpe.py
+++ b/hooks/charmhelpers/contrib/charmsupport/nrpe.py
@@ -247,7 +247,9 @@ class NRPE(object):

        service('restart', 'nagios-nrpe-server')

-        for rid in relation_ids("local-monitors"):
+        monitor_ids = relation_ids("local-monitors") + \
+            relation_ids("nrpe-external-master")
+        for rid in monitor_ids:
            relation_set(relation_id=rid, monitors=yaml.dump(monitors))