Merge ~silverdrake11/landscape-charm:fix_ha_jammy into landscape-charm:main

Proposed by Kevin Nasto
Status: Merged
Merged at revision: 3c75b2bb020a84354a5cbf55afa1c7cc7e667e6f
Proposed branch: ~silverdrake11/landscape-charm:fix_ha_jammy
Merge into: landscape-charm:main
Diff against target: 27 lines (+3/-2)
2 files modified
bundle.yaml (+2/-1)
src/haproxy-config.yaml (+1/-1)
Reviewer Review Type Date Requested Status
Austin Nhung Approve
Review via email: mp+454834@code.launchpad.net

Commit message

Fix config to work on new haxproxy on jammy

Description of the change

Manual testing instructions:
make build
connect landscape client to it
ensure packages show up
change back haproxy in bundle.yaml to ensure it still works in focal

To post a comment you must log in.
e9e5f41... by Kevin Nasto

Update yaml with ha on jammy

Revision history for this message
Austin Nhung (patriacaelum) wrote :

LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/bundle.yaml b/bundle.yaml
2index 528acc1..7ec17ae 100644
3--- a/bundle.yaml
4+++ b/bundle.yaml
5@@ -10,7 +10,8 @@ applications:
6 charm: ch:rabbitmq-server
7 num_units: 1
8 haproxy:
9- series: focal
10+ series: jammy
11+ channel: edge
12 charm: ch:haproxy
13 num_units: 1
14 expose: true
15diff --git a/src/haproxy-config.yaml b/src/haproxy-config.yaml
16index ac0475e..030fc6e 100644
17--- a/src/haproxy-config.yaml
18+++ b/src/haproxy-config.yaml
19@@ -38,7 +38,7 @@ https_service:
20 - use_backend landscape-hashid-databases if hashids
21 - acl package-upload path_beg -i /upload
22 - use_backend landscape-package-upload if package-upload
23- - reqrep ^([^\ ]*)\ /upload/(.*) \1\ /\2
24+ - http-request replace-path ^([^\ ]*)\ /upload/(.*) \1\ /\2
25
26 error_files:
27 location: /opt/canonical/landscape/canonical/landscape/offline

Subscribers

People subscribed via source and target branches

to all changes: