Merge lp://staging/~danilo/landscape-charm/api-endpoint into lp://staging/~landscape/landscape-charm/trunk
| Status: | Merged |
|---|---|
| Approved by: | Данило Шеган |
| Approved revision: | 319 |
| Merged at revision: | 316 |
| Proposed branch: | lp://staging/~danilo/landscape-charm/api-endpoint |
| Merge into: | lp://staging/~landscape/landscape-charm/trunk |
| Diff against target: |
56 lines (+16/-5) 2 files modified
lib/tests/test_templates.py (+6/-0) templates/service.conf (+10/-5) |
| To merge this branch: | bzr merge lp://staging/~danilo/landscape-charm/api-endpoint |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| 🤖 Landscape Builder | test results | Approve | |
| Free Ekanayaka (community) | Approve | ||
| Adam Collard (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Change API and package-upload root-urls to use the haproxy IP
This will ensure we are using the right base URL for the API endpoint on the /settings page.
However, the full URL will still be incorrect: "/api/" needs to be appended to it: we need to fix that in the landscape codebase.
Description of the change
Change API and package-upload root-urls to use the haproxy IP
This will ensure we are using the right base URL for the API endpoint on the /settings page.
However, the full URL will still be incorrect: "/api/" needs to be appended to it: I've fix that in the landscape codebase.
The API messages seem encrypted containing bits of the root-url, so it's not enough to append "/api/" to it: the API stops working. I've tested that with
landscape-api --uri=https:/
(selfsigned_ca.crt comes from haproxy-
To deploy the charm, grab landscape.yaml from https:/
juju-deployer -vdW -w90 -c landscape.yaml landscape
| 🤖 Landscape Builder (landscape-builder) wrote | # |
| Данило Шеган (danilo) wrote | # |
| 🤖 Landscape Builder (landscape-builder) wrote | # |
Command: make ci-test
Result: Success
Revno: 319
Branch: lp:~danilo/landscape-charm/api-endpoint
Jenkins: https:/