Merge ~jk0ne/charm-nrpe:principle_unit_fix into ~nrpe-charmers/charm-nrpe:master

Proposed by Jay Kuri
Status: Merged
Approved by: Haw Loeung
Approved revision: a153e5df3bec6f82b6d2908b3158c3f10eaeb3d8
Merged at revision: b2de3af2a4b7f3cd83b6eb3a7817f18aefb9f188
Proposed branch: ~jk0ne/charm-nrpe:principle_unit_fix
Merge into: ~nrpe-charmers/charm-nrpe:master
Diff against target: 13 lines (+1/-1)
1 file modified
hooks/nrpe_helpers.py (+1/-1)
Reviewer Review Type Date Requested Status
Haw Loeung Approve
Review via email: mp+328547@code.launchpad.net

Description of the change

fix principal_unit parameter

To post a comment you must log in.
Revision history for this message
Haw Loeung (hloeung) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/hooks/nrpe_helpers.py b/hooks/nrpe_helpers.py
2index 6768e99..c3f25a2 100644
3--- a/hooks/nrpe_helpers.py
4+++ b/hooks/nrpe_helpers.py
5@@ -158,7 +158,7 @@ class PrincipleRelation(helpers.RelationContext):
6 if hostname_type == 'host' or not self.is_ready():
7 return socket.gethostname()
8 else:
9- principle_unitname = hookenv.principal_unit('nrpe-external-master')
10+ principle_unitname = hookenv.principal_unit()
11 # Fallback to using "primary" if it exists.
12 if not principle_unitname:
13 for relunit in self[self.name]:

Subscribers

People subscribed via source and target branches