Merge ~mthaddon/charm-nagios/+git/trunk:master into ~nagios-charmers/charm-nagios:master

Proposed by Tom Haddon
Status: Merged
Merged at revision: 244464a242198e186d125c5f0e76a1a225f25050
Proposed branch: ~mthaddon/charm-nagios/+git/trunk:master
Merge into: ~nagios-charmers/charm-nagios:master
Diff against target: 13 lines (+2/-0)
1 file modified
hooks/upgrade-charm (+2/-0)
Reviewer Review Type Date Requested Status
Xav Paice (community) Approve
Review via email: mp+331366@code.launchpad.net

Description of the change

pagerduty requires the libhttp-parser-perl package lp#1718833

To post a comment you must log in.
Revision history for this message
Xav Paice (xavpaice) wrote :

Tested, LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/hooks/upgrade-charm b/hooks/upgrade-charm
2index 64b7e1d..89044f8 100755
3--- a/hooks/upgrade-charm
4+++ b/hooks/upgrade-charm
5@@ -112,6 +112,8 @@ def enable_livestatus_config():
6 def enable_pagerduty_config():
7 if enable_pagerduty:
8 hookenv.log("Pagerduty is enabled")
9+ fetch.apt_update()
10+ fetch.apt_install('libhttp-parser-perl')
11
12 # Ship the pagerduty_nagios.cfg file
13 template_values = {'enable_pagerduty': enable_pagerduty,

Subscribers

People subscribed via source and target branches