Merge lp:~wesmason/charms/trusty/conn-check/trunk-fix-nagios-hostname-default into lp:~ubuntuone-hackers/charms/trusty/conn-check/trunk

Proposed by Wes Mason on 2015-12-08
Status: Merged
Approved by: Wes Mason on 2015-12-08
Approved revision: 49
Merged at revision: 49
Proposed branch: lp:~wesmason/charms/trusty/conn-check/trunk-fix-nagios-hostname-default
Merge into: lp:~ubuntuone-hackers/charms/trusty/conn-check/trunk
Diff against target: 8 lines (+1/-1)
1 file modified
roles/nrpe-external-master/defaults/main.yaml (+1/-1)
To merge this branch: bzr merge lp:~wesmason/charms/trusty/conn-check/trunk-fix-nagios-hostname-default
Reviewer Review Type Date Requested Status
Wes Mason (community) Approve on 2015-12-08
Review via email: mp+279888@code.launchpad.net

Commit message

Fix nagios_hostname default to actually use relation

Description of the change

This fixes the nagios_hostname default in the nrpe role to use the relation nagios_hostname by default.

To post a comment you must log in.
Wes Mason (wesmason) wrote :

Rubber stamp, just bumped from main role.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'roles/nrpe-external-master/defaults/main.yaml'
2--- roles/nrpe-external-master/defaults/main.yaml 2015-07-20 16:11:40 +0000
3+++ roles/nrpe-external-master/defaults/main.yaml 2015-12-08 14:02:48 +0000
4@@ -1,3 +1,3 @@
5+nagios_hostname: "{{ relations['nrpe-external-master'][0].nagios_hostname|default(local_unit|replace('/', '-')) }}"
6 nagios_context: "{{ relations['nrpe-external-master'][0].nagios_host_context }}"
7-nagios_hostname: "{{ local_unit|replace('/', '-') }}"
8 nagios_servicegroups: "{{ nagios_context }}"

Subscribers

People subscribed via source and target branches

to all changes: