Merge lp://staging/~ev/ubuntu-ci-services-itself/fix-django-private-ip into lp://staging/ubuntu-ci-services-itself
Proposed by
Evan
| Status: | Merged |
|---|---|
| Approved by: | Chris Johnston |
| Approved revision: | 280 |
| Merged at revision: | 280 |
| Proposed branch: | lp://staging/~ev/ubuntu-ci-services-itself/fix-django-private-ip |
| Merge into: | lp://staging/ubuntu-ci-services-itself |
| Diff against target: |
13 lines (+2/-1) 1 file modified
charms/precise/python-django/hooks/hooks.py (+2/-1) |
| To merge this branch: | bzr merge lp://staging/~ev/ubuntu-ci-services-itself/fix-django-private-ip |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Approve | |
| Chris Johnston (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Add the django charm's private-address to ALLOWED_HOSTS. This unbreaks HP Cloud deployments.
Description of the change
The Django charm assumes that requests are only coming from the private-address. On Canonistack the public-address and public-address are the same, so this always works. On HP Cloud however, the public and private addresses are different, so requests from webui-apache to ts-django break.
To post a comment you must log in.
Revision history for this message
| Chris Johnston (cjohnston) | # |
review:
Approve
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
PASSED: Continuous integration, rev:280
http://
Executed test runs:
Click here to trigger a rebuild:
http://