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

Proposed by Wes Mason on 2016-04-26
Status: Merged
Approved by: Wes Mason on 2016-04-26
Approved revision: 51
Merged at revision: 51
Proposed branch: lp:~wesmason/charms/trusty/conn-check/fix-nrpe-race-condition
Merge into: lp:~ubuntuone-hackers/charms/trusty/conn-check/trunk
Diff against target: 11 lines (+1/-1)
1 file modified
playbook.yaml (+1/-1)
To merge this branch: bzr merge lp:~wesmason/charms/trusty/conn-check/fix-nrpe-race-condition
Reviewer Review Type Date Requested Status
Simon Davy 2016-04-26 Approve on 2016-04-26
Review via email: mp+292906@code.launchpad.net

Commit message

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

Description of the change

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.

To post a comment you must log in.
Simon Davy (bloodearnest) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'playbook.yaml'
2--- playbook.yaml 2015-12-09 09:21:39 +0000
3+++ playbook.yaml 2016-04-26 11:05:07 +0000
4@@ -20,7 +20,7 @@
5 - name: "{{ nagios_check_name }}"
6 command: "{{ env_dir }}/{{ revision }}/bin/conn-check --exclude-tags=no-nagios {{ args }} {{ config_path }}"
7 description: "Check outgoing connectivity/configuration"
8- when: relations['nrpe-external-master'] and 'nagios_host_context' in relations['nrpe-external-master'][0] and config_or_path_provided
9+ when: relations['conn-check'] and relations['nrpe-external-master'] and 'nagios_host_context' in relations['nrpe-external-master'][0] and config_or_path_provided
10
11 tasks:
12

Subscribers

People subscribed via source and target branches

to all changes: