← Back to branch summary

~gnuoy/charms/trusty/percona-cluster/sstpasswd2

« back to all changes in this revision

Viewing changes to hooks/charmhelpers/contrib/charmsupport/nrpe.py

  • Committer: Edward Hope-Morley
  • Date: 2015-05-06 16:43:56 UTC
  • mfrom: (56.1.1 percona-cluster.lp1451890)
  • Revision ID: edward.hope-morley@canonical.com-20150506164356-fj8iluvq7lufii91
[hopem,r=gnuoy]

Sync charm-helpers to get fix for LP 1451890.

Fixes issue with passwords stored in peer relation.
Upgrading will no longer ignore passwords stored
using old-style keys.

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/contrib/charmsupport/nrpe.py
247
247
 
248
248
        service('restart', 'nagios-nrpe-server')
249
249
 
250
 
        for rid in relation_ids("local-monitors"):
 
250
        monitor_ids = relation_ids("local-monitors") + \
 
251
            relation_ids("nrpe-external-master")
 
252
        for rid in monitor_ids:
251
253
            relation_set(relation_id=rid, monitors=yaml.dump(monitors))
252
254
 
253
255