Merge lp://qastaging/~aisrael/charm-helpers/HttpRelation into lp://qastaging/charm-helpers
Proposed by
Adam Israel
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~aisrael/charm-helpers/HttpRelation |
| Merge into: | lp://qastaging/charm-helpers |
| Diff against target: |
17 lines (+3/-3) 1 file modified
charmhelpers/core/services/helpers.py (+3/-3) |
| To merge this branch: | bzr merge lp://qastaging/~aisrael/charm-helpers/HttpRelation |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| charmers | Pending | ||
|
Review via email:
|
|||
Description of the change
This MP makes to changes to the HttpRelation:
1: change the 'host' required_key to 'hostname'. I did a cursory check of all charms returned via 'charm getall' and all of the website relations are using hostname.
2: change provide_data to return the hostname and port keys from the data provided by the relation, rather than private-address and the hard-coded port 80.
To post a comment you must log in.
Unmerged revisions
- 294. By Adam Israel
-
Change the host required_key to hostname
Change provide_data to return the port provided by the relation, instead of assuming port 80
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
