Nagios Charm

Merge ~xavpaice/charm-nagios:master into ~nagios-charmers/charm-nagios:master

  1. Git
  2. lp:~xavpaice/charm-nagios
  3. master
  4. Merge into master
Proposed by Xav Paice
Status: Merged
Merged at revision: 1f07e02548895639d1fe11f91cefd09de176bb8b
Proposed branch: ~xavpaice/charm-nagios:master
Merge into: ~nagios-charmers/charm-nagios:master
Diff against target: 13 lines (+1/-1)
1 file modified
hooks/monitors-relation-changed (+1/-1)
Reviewer Review Type Date Requested Status
Xav Paice (community) Approve
Review via email: mp+332351@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Xav Paice (xavpaice) wrote :

Trivial

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/hooks/monitors-relation-changed b/hooks/monitors-relation-changed
2index 7bb355b..4008d3a 100755
3--- a/hooks/monitors-relation-changed
4+++ b/hooks/monitors-relation-changed
5@@ -112,7 +112,7 @@ def apply_relation_config(relid, units, all_hosts):
6 container_regex = re.compile("(\d*)/lx[cd]/\d*")
7 if container_regex.search(machine_id):
8 parent_machine = container_regex.search(machine_id).group(1)
9- if all_hosts[parent_machine]:
10+ if parent_machine in all_hosts:
11 parent_host = all_hosts[parent_machine]
12
13 # If not set, we don't mess with it, as multiple services may feed

Subscribers

People subscribed via source and target branches