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

[Tom Haddon]

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

=== modified file 'charm-testing/nrpe/collect'
--- charm-testing/nrpe/collect	2017-04-05 14:11:17 +0000
+++ charm-testing/nrpe/collect	2017-04-05 15:22:56 +0000
@@ -1,1 +1,2 @@
+ubuntu      cs:{{ series }}/ubuntu
 nrpe        cs:{{ series }}/nrpe
 
=== modified file 'charm-testing/nrpe/deploy'
--- charm-testing/nrpe/deploy	2017-04-05 14:11:17 +0000
+++ charm-testing/nrpe/deploy	2017-04-05 15:22:56 +0000
@@ -1,8 +1,12 @@
-nrpe:
+ubuntu:
     series: {{series}}
     services:
+        ubuntu:
+            charm: ubuntu
         nrpe:
             charm: nrpe
             {% if series == "xenial" %}options:
                 procs: '-w 200 -c 250'
                 swap: '-w 90% -c 75% -n ok'{% endif %}
+    relations:
+        - ['ubuntu', 'nrpe']