Merge lp:~cjwatson/charm-haproxy/listener-address-localhost into lp:~haproxy-team/charm-haproxy/trunk-old-use-git
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Tom Haddon | ||||
Approved revision: | 162 | ||||
Merged at revision: | 162 | ||||
Proposed branch: | lp:~cjwatson/charm-haproxy/listener-address-localhost | ||||
Merge into: | lp:~haproxy-team/charm-haproxy/trunk-old-use-git | ||||
Diff against target: |
65 lines (+17/-14) 2 files modified
hooks/hooks.py (+7/-9) hooks/tests/test_statistics_hooks.py (+10/-5) |
||||
To merge this branch: | bzr merge lp:~cjwatson/charm-haproxy/listener-address-localhost | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tom Haddon | Approve | ||
Arturo Enrique Seijas Fernández (community) | Approve | ||
Canonical IS Reviewers | Pending | ||
Review via email:
|
Commit message
Set statistics listener-address to 127.0.0.1.
Description of the change
If `listener-address` isn't set on the relation, the telegraf charm defaults to using the unit's `private-address`; but `monitoring_
The statistics relation has `scope: container`, so the other end of it is always going to be on the same machine, and it makes sense to just advertise 127.0.0.1. This matches the behaviour of the content-cache charm.
This merge proposal is being monitored by mergebot. Change the status to Approved to merge.