Merge lp:~james-page/charm-helpers/nrpe-trusty-only into lp:charm-helpers

Proposed by James Page
Status: Merged
Merged at revision: 590
Proposed branch: lp:~james-page/charm-helpers/nrpe-trusty-only
Merge into: lp:charm-helpers
Diff against target: 12 lines (+1/-1)
1 file modified
charmhelpers/contrib/openstack/amulet/deployment.py (+1/-1)
To merge this branch: bzr merge lp:~james-page/charm-helpers/nrpe-trusty-only
Reviewer Review Type Date Requested Status
Ryan Beisner (community) Approve
Review via email: mp+298139@code.launchpad.net

Description of the change

Precise nrpe charm does not support all required interfaces, so just test
against the trusty version of the charm.

To post a comment you must log in.
Revision history for this message
Ryan Beisner (1chb1n) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charmhelpers/contrib/openstack/amulet/deployment.py'
2--- charmhelpers/contrib/openstack/amulet/deployment.py 2016-06-10 13:07:31 +0000
3+++ charmhelpers/contrib/openstack/amulet/deployment.py 2016-06-22 16:16:03 +0000
4@@ -73,7 +73,7 @@
5 base_charms = {
6 'mysql': ['precise', 'trusty'],
7 'mongodb': ['precise', 'trusty'],
8- 'nrpe': ['precise', 'trusty'],
9+ 'nrpe': ['trusty'],
10 }
11
12 for svc in other_services:

Subscribers

People subscribed via source and target branches