Mojo: Continuous Delivery for Juju

Merge lp:~mthaddon/mojo/nrpe-charm-testing into lp:mojo/mojo-specs

  1. nrpe-charm-testing
  2. Merge into mojo-specs
Proposed by Tom Haddon
Status: Merged
Approved by: Jamon Camisso
Approved revision: 40
Merged at revision: 40
Proposed branch: lp:~mthaddon/mojo/nrpe-charm-testing
Merge into: lp:mojo/mojo-specs
Diff against target: 24 lines (+6/-1)
2 files modified
charm-testing/nrpe/collect (+1/-0)
charm-testing/nrpe/deploy (+5/-1)
To merge this branch: bzr merge lp:~mthaddon/mojo/nrpe-charm-testing
Reviewer Review Type Date Requested Status
Mojo Maintainers Pending
Review via email: mp+322014@code.launchpad.net

Description of the change

We need a primary charm in the environment for any kind of useful testing of nrpe, so just use the ubuntu charm and create a relation

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charm-testing/nrpe/collect'
2--- charm-testing/nrpe/collect 2017-04-05 14:11:17 +0000
3+++ charm-testing/nrpe/collect 2017-04-05 15:22:56 +0000
4@@ -1,1 +1,2 @@
5+ubuntu cs:{{ series }}/ubuntu
6 nrpe cs:{{ series }}/nrpe
7
8=== modified file 'charm-testing/nrpe/deploy'
9--- charm-testing/nrpe/deploy 2017-04-05 14:11:17 +0000
10+++ charm-testing/nrpe/deploy 2017-04-05 15:22:56 +0000
11@@ -1,8 +1,12 @@
12-nrpe:
13+ubuntu:
14 series: {{series}}
15 services:
16+ ubuntu:
17+ charm: ubuntu
18 nrpe:
19 charm: nrpe
20 {% if series == "xenial" %}options:
21 procs: '-w 200 -c 250'
22 swap: '-w 90% -c 75% -n ok'{% endif %}
23+ relations:
24+ - ['ubuntu', 'nrpe']

Subscribers

People subscribed via source and target branches

to all changes: