Merge lp:~wesmason/charms/trusty/conn-check/fix-nrpe-race-condition into lp:~ubuntuone-hackers/charms/trusty/conn-check/trunk

[Wes Mason]

Ensure we have the conn-check relation before we invoke the nrpe role

This is fix for #1528595, in which the nrpe relation is joined before we have all the info we require from the conn-check relation.

[Simon Davy (bloodearnest)]

review: Approve

=== modified file 'playbook.yaml'
--- playbook.yaml	2015-12-09 09:21:39 +0000
+++ playbook.yaml	2016-04-26 11:05:07 +0000
@@ -20,7 +20,7 @@
         - name: "{{ nagios_check_name }}"
           command: "{{ env_dir }}/{{ revision }}/bin/conn-check --exclude-tags=no-nagios {{ args }} {{ config_path }}"
           description: "Check outgoing connectivity/configuration"
-     when: relations['nrpe-external-master'] and 'nagios_host_context' in relations['nrpe-external-master'][0] and config_or_path_provided
+     when: relations['conn-check'] and relations['nrpe-external-master'] and 'nagios_host_context' in relations['nrpe-external-master'][0] and config_or_path_provided
 
   tasks: