Merge ~cjwatson/launchpad:charm-appserver-http-interface into launchpad:master
Status: | Merged |
---|---|
Approved by: | Colin Watson |
Approved revision: | c9b602eb5591aab4c736ce8bee146f31cbe051cb |
Merge reported by: | Otto Co-Pilot |
Merged at revision: | not available |
Proposed branch: | ~cjwatson/launchpad:charm-appserver-http-interface |
Merge into: | launchpad:master |
Diff against target: |
161 lines (+106/-0) 5 files modified
charm/launchpad-appserver/README.md (+4/-0) charm/launchpad-appserver/config.yaml (+24/-0) charm/launchpad-appserver/layer.yaml (+1/-0) charm/launchpad-appserver/metadata.yaml (+3/-0) charm/launchpad-appserver/reactive/launchpad-appserver.py (+74/-0) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Guruprasad | Approve | ||
Review via email: mp+444283@code.launchpad.net |
Commit message
charm/launchpad
Description of the change
This allows relating `launchpad-
The code is based on the `ols-http` layer, but I had to write custom code for it because the appserver exposes two ports with different purposes (the main application, and XML-RPC); and the current production `haproxy` configuration uses slightly different options for those two, with special error page handling for the main application.
While this doesn't result in the exact same `haproxy` configuration that we have on production, I think it's equivalent.
LGTM 👍