Canonical Livepatch Charm

Merge ~barryprice/charm-canonical-livepatch/+git/canonical-livepatch-charm:master into ~livepatch-charmers/charm-canonical-livepatch:master

Proposed by Barry Price on 2016-12-01

Status:	Merged
Approved by:	Tom Haddon on 2016-12-01
Approved revision:	8d768594dd13bb1537c34784344d6ff680594289
Merged at revision:	dec1a42851b05c263617f9fb921851bf90165dc5
Proposed branch:	~barryprice/charm-canonical-livepatch/+git/canonical-livepatch-charm:master
Merge into:	~livepatch-charmers/charm-canonical-livepatch:master
Diff against target:	23 lines (+2/-4) 1 file modified reactive/canonical_livepatch.py (+2/-4)
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Tom Haddon		Approve on 2016-12-01
Livepatch charm developers	2016-12-01	Pending
Review via email: mp+312242@code.launchpad.net

Revision history for this message

Tom Haddon (mthaddon) wrote on 2016-12-01:

Looks good

review: Approve

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	diff --git a/reactive/canonical_livepatch.py b/reactive/canonical_livepatch.py
2	index 3991622..c131686 100644
3	--- a/reactive/canonical_livepatch.py
4	+++ b/reactive/canonical_livepatch.py
5	@@ -117,7 +117,7 @@ def update_nagios_servicedef(service_name, service_value):
6	new_els.append(e)
7	else:
8	new_els.append(service_value)
9	- new_line = ' '.join(new_els)
10	+ new_line = ' '.join(new_els) + "\n"
11	output += new_line
12	else:
13	output += line
14	@@ -235,8 +235,6 @@ def init_nagios_checks(nagios):
15	def update_nagios_servicegroups():
16	hookenv.status_set('maintenance', 'Configuring Nagios checks')
17
18	- servicename = 'servicegroups'
19	-
20	config = hookenv.config()
21	nagios_servicegroups = config.get('nagios_servicegroups')
22	- update_nagios_servicedef(servicename, nagios_servicegroups)
23	+ update_nagios_servicedef('servicegroups', nagios_servicegroups)