← Back to branch summary

~hopem/charm-helpers/fix-ssl-disable

« back to all changes in this revision

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

  • Committer: Liam Young
  • Date: 2015-02-19 08:40:41 UTC
  • mfrom: (316.1.3 charm-helpers)
  • Revision ID: liam.young@canonical.com-20150219084041-pm1fzn91i0wxvt8a
[bradm, r=gnuoy] Fix the case of the empty nagios_servicegroup meaning we end up with a check with an empty service group.

Show diffs side-by-side

added added

removed removed

Lines of Context:
charmhelpers/contrib/charmsupport/nrpe.py
210
210
        super(NRPE, self).__init__()
211
211
        self.config = config()
212
212
        self.nagios_context = self.config['nagios_context']
213
 
        if 'nagios_servicegroups' in self.config:
 
213
        if 'nagios_servicegroups' in self.config and self.config['nagios_servicegroups']:
214
214
            self.nagios_servicegroups = self.config['nagios_servicegroups']
215
215
        else:
216
216
            self.nagios_servicegroups = self.nagios_context