Charm Helpers

Merge lp:~pjdc/charm-helpers/nrpe-hostname-from-relation into lp:charm-helpers

  1. nrpe-hostname-from-relation
  2. Merge into devel
Proposed by Paul Collins
Status: Merged
Merged at revision: 475
Proposed branch: lp:~pjdc/charm-helpers/nrpe-hostname-from-relation
Merge into: lp:charm-helpers
Diff against target: 16 lines (+5/-1)
1 file modified
charmhelpers/contrib/charmsupport/nrpe.py (+5/-1)
To merge this branch: bzr merge lp:~pjdc/charm-helpers/nrpe-hostname-from-relation
Reviewer Review Type Date Requested Status
Tim Kuhlman (community) Approve
charmers Pending
Review via email: mp+275940@code.launchpad.net

Description of the change

nrpe.NRPE.__init__(): if hostname is not specified, read it from the relation in preference to constructing it ourselves

To post a comment you must log in.
Revision history for this message
Tim Kuhlman (timkuhlman) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charmhelpers/contrib/charmsupport/nrpe.py'
2--- charmhelpers/contrib/charmsupport/nrpe.py 2015-03-16 17:54:34 +0000
3+++ charmhelpers/contrib/charmsupport/nrpe.py 2015-10-28 02:10:15 +0000
4@@ -218,7 +218,11 @@
5 if hostname:
6 self.hostname = hostname
7 else:
8- self.hostname = "{}-{}".format(self.nagios_context, self.unit_name)
9+ nagios_hostname = get_nagios_hostname()
10+ if nagios_hostname:
11+ self.hostname = nagios_hostname
12+ else:
13+ self.hostname = "{}-{}".format(self.nagios_context, self.unit_name)
14 self.checks = []
15
16 def add_check(self, *args, **kwargs):

Subscribers

People subscribed via source and target branches