Merge lp://staging/~michael.nelson/charms/precise/elasticsearch/use-nrpe-hostname into lp://staging/~michael.nelson/charms/precise/elasticsearch/trunk
Proposed by
Michael Nelson
| Status: | Merged |
|---|---|
| Merged at revision: | 18 |
| Proposed branch: | lp://staging/~michael.nelson/charms/precise/elasticsearch/use-nrpe-hostname |
| Merge into: | lp://staging/~michael.nelson/charms/precise/elasticsearch/trunk |
| Diff against target: |
192 lines (+61/-14) 9 files modified
Makefile (+1/-1) hooks/charmhelpers/contrib/templating/contexts.py (+13/-3) hooks/charmhelpers/fetch/__init__.py (+23/-0) hooks/charmhelpers/fetch/archiveurl.py (+15/-0) playbook.yaml (+0/-1) roles/nrpe/defaults/main.yml (+0/-2) roles/nrpe/tasks/main.yml (+1/-1) roles/nrpe/templates/check_name_service_export.cfg.jinja2 (+2/-2) templates/elasticsearch.yml (+6/-4) |
| To merge this branch: | bzr merge lp://staging/~michael.nelson/charms/precise/elasticsearch/use-nrpe-hostname |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Simon Davy (community) | Approve | ||
| Michael Nelson | Pending | ||
|
Review via email:
|
|||
Description of the change
* Updates charm-helpers and update to use new relations format.
* Uses the nrpe-provided nagios_hostname and nagios_
To post a comment you must log in.
Revision history for this message
| Simon Davy (bloodearnest) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
