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

[Paul Collins]

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

[Tim Kuhlman (timkuhlman)]

lgtm

review: Approve

=== modified file 'charmhelpers/contrib/charmsupport/nrpe.py'
--- charmhelpers/contrib/charmsupport/nrpe.py	2015-03-16 17:54:34 +0000
+++ charmhelpers/contrib/charmsupport/nrpe.py	2015-10-28 02:10:15 +0000
@@ -218,7 +218,11 @@
         if hostname:
             self.hostname = hostname
         else:
-            self.hostname = "{}-{}".format(self.nagios_context, self.unit_name)
+            nagios_hostname = get_nagios_hostname()
+            if nagios_hostname:
+                self.hostname = nagios_hostname
+            else:
+                self.hostname = "{}-{}".format(self.nagios_context, self.unit_name)
         self.checks = []
 
     def add_check(self, *args, **kwargs):