Merge autopkgtest-cloud:net-name-for-region into autopkgtest-cloud:master

[Brian Murray]

Then network in PS5 is named net_stg-proposed-migration while in PS45 it is named net_stg_proposed-migration. To be able to allow the PS45 autopkgtest-cloud-worker units to access PS5 I made changes to build-adt-image (this MP) and worker-lcy02.conf (hacking --net-id argument).

It's entirely possible there is an "easy" way to copy the net_stg-proposed-migration network to net_stg_proposed-migration in PS5 but I couldn't find it. I also took this direction given that PS45 accessing PS5 should be short lived because everything should move to PS5.

[Brian Murray (brian-murray)]

Well there was an "easy" way to rename the net_stg_proposed-migration to net_stg-proposed-migration so I did that instead.

This was the command:

openstack network set --name net_stg-proposed-migration c052b3b1-c074-45de-99be-fb331383b2cc

Although I had to use openstack on a cloud-worker and not the bastion because that version of openstack is soooo old.

Unmerged commits

cd564a3... by Brian Murray on 2023-06-07

tools: read and prefer net-name-$region rc files

	build_charms:0 (build)
	lint_test:0 (build)

1 → 2 of 2 results

First • Previous • Next • Last

diff --git a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/build-adt-image b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/build-adt-image
index be6b4d3..c2144a9 100755
--- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/build-adt-image
+++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/build-adt-image
@@ -20,7 +20,13 @@ if [ -z "${MIRROR:-}" ]; then
 fi
 export MIRROR
 
-[ -z "${NET_NAME:-}" ] && . ~/net-name.rc
+if [ -z "${NET_NAME:-}" ]; then
+        if [ -e ~/net-name-${REGION}.rc ]; then
+                . ~/net-name-${REGION}.rc
+        else
+                ~/net-name.rc
+        fi
+fi
 export NET_NAME
 
 if [ -z "${USE_CLOUD_CONFIG_FROM_ENV:-}" ]; then