Merge ~pjdc/ubuntu-mirror-charm/+git/ubuntu-mirror-charm:trigger-1stage into ubuntu-mirror-charm:master

[Paul Collins]

implement downstream triggering for mirror-1stage.sh

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

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

[Haw Loeung (hloeung)]

LGTM

review: Approve (+1)

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

Change successfully merged at revision 44dcb22b1bd759debe6f98bc5e4de74077b69feb

diff --git a/files/mirror-1stage.sh b/files/mirror-1stage.sh
index 6348aa1..0f97175 100755
--- a/files/mirror-1stage.sh
+++ b/files/mirror-1stage.sh
@@ -76,5 +76,12 @@ rsync --verbose --recursive --times --links --hard-links \
 
 install -d "${DEST_DIR}/.trace/"
 date -u > "${DEST_DIR}/.trace/${role}-${myhostname}"
+
+if [ -n "${DOWNSTREAM_MIRRORS}" -a -n "${TRIGGER_KEYFILE}" ]; then
+    t=15m
+    log "== Triggering downstream mirrors (will give up after $t) =="
+    timeout $t ${SCRIPT_DIR}/trigger-downstream-mirrors.sh $role $TRIGGER_KEYFILE $DOWNSTREAM_MIRRORS
+fi
+
 savelog ${logfile} > /dev/null 2>&1
 rm -f ${lockpath} > /dev/null 2>&1