canonical-ubuntu-qa team mailing list archive

[Brian Murray <mp+460545@xxxxxxxxxxxxxxxxxx>]

Brian Murray has proposed merging autopkgtest-cloud:no-routers-in-ps5 into autopkgtest-cloud:master.

Requested reviews:
  Canonical's Ubuntu QA (canonical-ubuntu-qa)

For more details, see:
https://code.launchpad.net/~ubuntu-release/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/460545

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.
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of autopkgtest-cloud:no-routers-in-ps5 into autopkgtest-cloud:master.

diff --git a/mojo/make-lxd-secgroup b/mojo/make-lxd-secgroup
index c3f55ab..a97baa5 100755
--- a/mojo/make-lxd-secgroup
+++ b/mojo/make-lxd-secgroup
@@ -2,17 +2,6 @@
 # shellcheck disable=SC1090
 set -eu
 
-# FIXME: the production router IP is
-# prodstack45-router-ue: [162.213.33.32]
-# and the environment has moved onto PS5
-# which may not even have a router involved.
-# there's apparently no way to get this dynamically
-if [ "${MOJO_STAGE:-}" = "production" ]; then
-        ROUTER_IP=162.213.33.32
-elif [ "${MOJO_STAGE:-}" = "staging" ]; then
-        ROUTER_IP=185.125.191.193
-fi
-
 # source the credentials for the DC where armhf tests run
 . ~/.scalingstack/bos02-arm64.rc
 
@@ -25,7 +14,3 @@ fi
 for ip in ${LXD_IPS}; do
         openstack security group rule create lxd --protocol tcp --dst-port 8443:8443 --remote-ip "${ip}/32" 2>/dev/null || true  # perhaps it already existed
 done
-
-if [ -n "${ROUTER_IP:-}" ]; then
-        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
-fi