Merge ~pjdc/ubuntu-mirror-charm/+git/ubuntu-mirror-charm:check-mirror-new-roles into ubuntu-mirror-charm:master

[Paul Collins]

check-mirror.sh: add maas-images and ubuntu-cloud-archive support

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[David Lawson (deej)]

LGTM

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 9bdf2c31429a8922da3d00e5fbcafc2cd052b86d

diff --git a/files/check-mirror.sh b/files/check-mirror.sh
index dde03f6..a04d177 100755
--- a/files/check-mirror.sh
+++ b/files/check-mirror.sh
@@ -43,6 +43,10 @@ case ${role} in
         unsigned=ubuntu/dists/xenial/Release
         signed=${unsigned}.gpg
         ;;
+    ubuntu-cloud-archive)
+        unsigned=ubuntu/dists/focal-updates/victoria/Release
+        signed=${unsigned}.gpg
+        ;;
     releases)
         unsigned=xenial/SHA256SUMS
         signed=${unsigned}.gpg
@@ -64,9 +68,15 @@ case ${role} in
         signed=${unsigned}.gpg
         ;;
     simple-streams)
+	# TODO(pjdc): key is not packaged; fetch from install hook?
         unsigned=juju/images/releases/streams/v1/index.json
-        signed=${unsigned}.gpg
+        signed=${unsigned}.gpg	# not used
         ;;
+    maas-images)
+	# NOTE(pjdc): ephemeral-v3 is the current stuff and seems to have no fixed paths to signed files we could check
+	unsigned=ephemeral-v3/daily/focal/amd64/
+	signed=${unsigned}.gpg  # not used
+	;;
     *)
         echo "Unknown mirror role, ${role}"
         exit 2
@@ -76,8 +86,7 @@ tmpsigned=${tmpdir}/$(basename ${signed})
 tmpunsigned=${tmpdir}/$(basename ${unsigned})
 
 case ${role} in
-    # TODO(pjdc): Key is not packaged; fetch from install hook?
-    simple-streams)
+    maas-images|simple-streams)
         for ipaddr in $@; do
             if ! curl -s -o"${tmpunsigned}" --resolve ${urlhost}:${port}:${ipaddr}  "${scheme}://${urlhost}/${unsigned}"; then
                 echo "Mirror CRITICAL [${unsigned} failed to fetch from ${ipaddr} for ${scheme}://${urlhost}/]"
@@ -93,6 +102,9 @@ case ${role} in
     old-releases)
         keyring_file=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg
         ;;
+    ubuntu-cloud-archive)
+	keyring_file=/usr/share/keyrings/ubuntu-cloud-keyring.gpg
+	;;
     *)
         keyring_file=/usr/share/keyrings/ubuntu-archive-keyring.gpg
         ;;
diff --git a/hooks/hooks.py b/hooks/hooks.py
index 824fc28..5bf370c 100755
--- a/hooks/hooks.py
+++ b/hooks/hooks.py
@@ -67,6 +67,7 @@ required_pkgs = [
     'procmail',     # provides lockfile
     'rsync',
     'vsftpd',
+    'ubuntu-cloud-keyring',     # for check-mirror.sh
     'xinetd',
 ]