Merge lp:~gnuoy/charms/precise/haproxy/return-servicename-specfic-config into lp:charms/haproxy
Proposed by
Liam Young
Status: | Merged |
---|---|
Approved by: | Juan L. Negron |
Approved revision: | 59 |
Merge reported by: | Juan L. Negron |
Merged at revision: | not available |
Proposed branch: | lp:~gnuoy/charms/precise/haproxy/return-servicename-specfic-config |
Merge into: | lp:charms/haproxy |
Diff against target: |
67 lines (+34/-8) 1 file modified
hooks/hooks.py (+34/-8) |
To merge this branch: | bzr merge lp:~gnuoy/charms/precise/haproxy/return-servicename-specfic-config |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juan L. Negron (community) | Approve | ||
Review via email: mp+124731@code.launchpad.net |
Description of the change
Currently the haproxy charm allows for multiple stanzas to be defined on different IP and ports but when a charm joins the website relationship it is always given hostname:80 so doesn't have access to any of the additional configs. I've added code so that if a specfic service has been asked for when the website relationship is called then return the ip:port for that service, else pass back the default.
I've also added a change to expose a variable (all_services) which contains a yaml list of all available services in case the joining charm want to use more than one
To post a comment you must log in.
Reviewing this now.
-Juan