Merge lp:~tribaal/landscape-charm/add-root-url into lp:~landscape/landscape-charm/trunk
Proposed by
Chris Glass
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Chris Glass | ||||
Approved revision: | 256 | ||||
Merged at revision: | 253 | ||||
Proposed branch: | lp:~tribaal/landscape-charm/add-root-url | ||||
Merge into: | lp:~landscape/landscape-charm/trunk | ||||
Diff against target: |
282 lines (+167/-5) 10 files modified
config.yaml (+6/-0) hooks/lib/relations/config.py (+23/-0) hooks/lib/relations/haproxy.py (+2/-1) hooks/lib/relations/tests/test_config.py (+59/-0) hooks/lib/relations/tests/test_landscape.py (+1/-1) hooks/lib/services.py (+3/-2) hooks/lib/tests/test_templates.py (+25/-1) hooks/lib/tests/test_utils.py (+29/-0) hooks/lib/utils.py (+14/-0) templates/service.conf (+5/-0) |
||||
To merge this branch: | bzr merge lp:~tribaal/landscape-charm/add-root-url | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Free Ekanayaka (community) | Approve | ||
Benji York (community) | Approve | ||
🤖 Landscape Builder | test results | Approve | |
Review via email: mp+256918@code.launchpad.net |
Commit message
This branch introduces a root-url global configuration item, and sets it to either the
value of the root-url charm configuration option or (if it's not present), the
haproxy's public-address (as set throught the website relation).
Description of the change
This branch introduces a root-url global configuration item, and sets it to either the
value of the root-url charm configuration option or (if it's not present), the
haproxy's public-address (as set throught the website relation).
To post a comment you must log in.
Command: make ci-test /ci.lscape. net/job/ latch-test/ 520/
Result: Success
Revno: 252
Branch: lp:~tribaal/landscape-charm/add-root-url
Jenkins: https:/