Merge autopkgtest-cloud:no-routers-in-ps5 into autopkgtest-cloud:master

Proposed by Brian Murray
Status: Merged
Merged at revision: 15c341abd30919bd0cf018be21d12101be50a33f
Proposed branch: autopkgtest-cloud:no-routers-in-ps5
Merge into: autopkgtest-cloud:master
Diff against target: 30 lines (+0/-15)
1 file modified
mojo/make-lxd-secgroup (+0/-15)
Reviewer Review Type Date Requested Status
Tim Andersson Approve
Review via email: mp+460545@code.launchpad.net

Description of the change

I've confirmed with Canonical IS that SNAT is not used in PS5 or PS6 so we don't need the security group rules with the router IPs anymore.

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

LGTM, CI is tempfail and also an issue from an MP I merged yesterday

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/mojo/make-lxd-secgroup b/mojo/make-lxd-secgroup
2index c3f55ab..a97baa5 100755
3--- a/mojo/make-lxd-secgroup
4+++ b/mojo/make-lxd-secgroup
5@@ -2,17 +2,6 @@
6 # shellcheck disable=SC1090
7 set -eu
8
9-# FIXME: the production router IP is
10-# prodstack45-router-ue: [162.213.33.32]
11-# and the environment has moved onto PS5
12-# which may not even have a router involved.
13-# there's apparently no way to get this dynamically
14-if [ "${MOJO_STAGE:-}" = "production" ]; then
15- ROUTER_IP=162.213.33.32
16-elif [ "${MOJO_STAGE:-}" = "staging" ]; then
17- ROUTER_IP=185.125.191.193
18-fi
19-
20 # source the credentials for the DC where armhf tests run
21 . ~/.scalingstack/bos02-arm64.rc
22
23@@ -25,7 +14,3 @@ fi
24 for ip in ${LXD_IPS}; do
25 openstack security group rule create lxd --protocol tcp --dst-port 8443:8443 --remote-ip "${ip}/32" 2>/dev/null || true # perhaps it already existed
26 done
27-
28-if [ -n "${ROUTER_IP:-}" ]; then
29- openstack security group rule create lxd --protocol tcp --dst-port 8443:8443 --remote-ip "${ROUTER_IP}/32" 2>/dev/null || true # perhaps it already existed
30-fi

Subscribers

People subscribed via source and target branches