Juju Charms Collection
postgresql package

Merge lp://qastaging/~pjdc/charms/trusty/postgresql/hostname-from-n-e-m into lp://qastaging/charms/trusty/postgresql

  1. Trusty Tahr (14.04)
  2. hostname-from-n-e-m
  3. Merge into trunk
Proposed by Paul Collins
Status: Merged
Merged at revision: 114
Proposed branch: lp://qastaging/~pjdc/charms/trusty/postgresql/hostname-from-n-e-m
Merge into: lp://qastaging/charms/trusty/postgresql
Diff against target: 37 lines (+21/-3)
1 file modified
hooks/hooks.py (+21/-3)
To merge this branch: bzr merge lp://qastaging/~pjdc/charms/trusty/postgresql/hostname-from-n-e-m
Reviewer Review Type Date Requested Status
Stuart Bishop (community) Approve
Review via email: mp+249141@code.qastaging.launchpad.net

Description of the change

update_nrpe_checks(): fetch nagios_hostname from nrpe-external-master relation

This is necessary to emit valid nagios configs when related to n-e-m that has nagios_hostname_type=host, which can be the case with e.g. MAAS deployments.

Fall back to our previous behavour of constructing the hostname ourselves if nagios_hostname is not set or if there are multiple relations found.

To post a comment you must log in.
Revision history for this message
Stuart Bishop (stub) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: