Merge lp://qastaging/~danilo/landscape-charm/no-pppa-proxy-without-hosted into lp://qastaging/~landscape/landscape-charm/trunk
| Status: | Merged |
|---|---|
| Approved by: | Данило Шеган |
| Approved revision: | 382 |
| Merged at revision: | 381 |
| Proposed branch: | lp://qastaging/~danilo/landscape-charm/no-pppa-proxy-without-hosted |
| Merge into: | lp://qastaging/~landscape/landscape-charm/trunk |
| Diff against target: |
56 lines (+34/-1) 2 files modified
lib/relations/haproxy.py (+3/-1) lib/relations/tests/test_haproxy.py (+31/-0) |
| To merge this branch: | bzr merge lp://qastaging/~danilo/landscape-charm/no-pppa-proxy-without-hosted |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Adam Collard (community) | Approve | ||
| Alberto Donato (community) | Approve | ||
| 🤖 Landscape Builder | test results | Approve | |
|
Review via email:
|
|||
Commit message
Do not add pppa-proxy entries to HAProxy config when no hosted relation is present
We already had this as conditional, but the conditions were not sufficient since HostedRequirer itself augmented the returned data with a "deployment-mode: standalone" when there was no hosted relation.
Description of the change
Do not add pppa-proxy entries to HAProxy config when no hosted relation is present
We already had this as conditional, but the conditions were not sufficient since HostedRequirer itself augmented the returned data with a "deployment-mode: standalone" when there was no hosted relation.
Testing instructions:
"make deploy" in the charm
Notice how haproxy-IP:10000 (haproxy:haproxy user/pass) does not list pppa-proxy anymore.
Deploy landscape-hosted charm, configure it with eg.
juju config landscape-hosted --file <data from https:/
Check haproxy-IP:10000 again and notice how there is an entry for pppa-proxy now.
Also check haproxy/
| 🤖 Landscape Builder (landscape-builder) | # |
| 🤖 Landscape Builder (landscape-builder) wrote | # |
Command: make ci-test
Result: Success
Revno: 382
Branch: lp:~danilo/landscape-charm/no-pppa-proxy-without-hosted
Jenkins: https:/