Merge lp://qastaging/~doanac/uci-engine/lander-health-fixes into lp://qastaging/uci-engine
Proposed by
Andy Doan
Status: | Merged |
---|---|
Approved by: | Andy Doan |
Approved revision: | 516 |
Merged at revision: | 524 |
Proposed branch: | lp://qastaging/~doanac/uci-engine/lander-health-fixes |
Merge into: | lp://qastaging/uci-engine |
Prerequisite: | lp://qastaging/~doanac/uci-engine/engine-health-private |
Diff against target: |
96 lines (+28/-13) 2 files modified
charms/precise/webui/hooks/hooks.py (+27/-12) juju-deployer/configs/webui_http_vhost (+1/-1) |
To merge this branch: | bzr merge lp://qastaging/~doanac/uci-engine/lander-health-fixes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Celso Providelo (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email:
|
Commit message
engine health: support private ips
in staging our engine health providers are behind private IPs.
This creates a proxy so that we can connect to them.
To post a comment you must log in.
PASSED: Continuous integration, rev:516 s-jenkins. ubuntu- ci:8080/ job/uci- engine- ci/743/
http://
Executed test runs:
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/uci- engine- ci/743/ rebuild
http://