Merge autopkgtest-cloud:no-haproxy-lxd into autopkgtest-cloud:master

Proposed by Brian Murray
Status: Merged
Merged at revision: e788139102c31dacfa6ad94ad223343ab505f199
Proposed branch: autopkgtest-cloud:no-haproxy-lxd
Merge into: autopkgtest-cloud:master
Diff against target: 18 lines (+1/-2)
1 file modified
mojo/make-lxd-secgroup (+1/-2)
Reviewer Review Type Date Requested Status
Tim Andersson Approve
Review via email: mp+460053@code.launchpad.net

Description of the change

Looking at make-lxd-secgroup I saw a reference to haproxy-lxd-armhf which is an application which is no longer in use in the proposed-migration environment, so let's drop that and prevent the following error from appearing when calling the script directly or doing a mojo run.

prod-proposed-migration-environment@ubuntu-qa-bastion-ps5:~/autopkgtest-cloud$ mojo/make-lxd-secgroup
Nothing matched specified filter.
jq: error (at <stdin>:1): Cannot iterate over null (null)

To post a comment you must log in.
Revision history for this message
Tim Andersson (andersson123) wrote :

CI is unrelated tempfail, I'm going to merge this

Revision history for this message
Tim Andersson (andersson123) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/mojo/make-lxd-secgroup b/mojo/make-lxd-secgroup
index 021ab84..fe75f56 100755
--- a/mojo/make-lxd-secgroup
+++ b/mojo/make-lxd-secgroup
@@ -13,13 +13,12 @@ fi
13. ~/.scalingstack/bos02-arm64.rc13. ~/.scalingstack/bos02-arm64.rc
1414
15LXD_IPS=$(juju status --format=json autopkgtest-lxd-worker | jq --monochrome-output --raw-output '.applications["autopkgtest-lxd-worker"].units | map(.["public-address"])[]')15LXD_IPS=$(juju status --format=json autopkgtest-lxd-worker | jq --monochrome-output --raw-output '.applications["autopkgtest-lxd-worker"].units | map(.["public-address"])[]')
16HAPROXY_IPS=$(juju status --format=json haproxy-lxd-armhf | jq --monochrome-output --raw-output '.applications["haproxy-lxd-armhf"].units | map(.["public-address"])[]')
1716
18if ! openstack security group rule list lxd >/dev/null 2>/dev/null; then17if ! openstack security group rule list lxd >/dev/null 2>/dev/null; then
19 openstack security group create --description "Let the LXD workers communicate with the LXD VMs" lxd18 openstack security group create --description "Let the LXD workers communicate with the LXD VMs" lxd
20fi19fi
2120
22for ip in ${LXD_IPS} ${HAPROXY_IPS}; do21for ip in ${LXD_IPS}; do
23 openstack security group rule create lxd --protocol tcp --dst-port 8443:8443 --remote-ip "${ip}/32" 2>/dev/null || true # perhaps it already existed22 openstack security group rule create lxd --protocol tcp --dst-port 8443:8443 --remote-ip "${ip}/32" 2>/dev/null || true # perhaps it already existed
24done23done
2524

Subscribers

People subscribed via source and target branches