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
Reviewer Review Type Date Requested Status
Celso Providelo (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+221401@code.qastaging.launchpad.net

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.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:516
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/743/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/743/rebuild

review: Approve (continuous-integration)
Revision history for this message
Celso Providelo (cprov) wrote :

As we discussed, webui charm is very test-friendly and we should start requiring tests for changes, but this requirement is temporarily lifted until the completely redesigned webui/app charm lands (in few days).

Other than that, this branch exposes the 'json_status' urls of all our services publicly via the webui-apache. While it's fine for now, particularly for airline-staging, we might revisit this decision/implementation soon when we have a better understand of how it plays with the new web-app (django) and authentication.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches