From 37163532ee13a91288d26fef4dc5f8a03dfe185b Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Tue, 4 Jul 2023 12:28:38 +0200 Subject: [PATCH] MT#56773 Use bullseye puppetlabs repository for bookworm To be able to upgrade our internal systems to Debian/bookworm we need to have puppet packages available. Upstream still doesn't provide any Debian packages (see https://tickets.puppetlabs.com/browse/PA-4995), though their AIO (All In One) packages for Debian/bullseye seem to be working on Debian/bookworm as well (at least for puppet-agent). So until we either migrated to puppet-agent as present in Debian/bookworm or upstream provides according AIO packages, let's use the puppet-agent packages we already use for our Debian/bullseye systems. Change-Id: I2211ffd79f70a2a79873e737b0b512bfb7492328 --- templates/scripts/includes/deployment.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/templates/scripts/includes/deployment.sh b/templates/scripts/includes/deployment.sh index 83fb20f..e2bd994 100755 --- a/templates/scripts/includes/deployment.sh +++ b/templates/scripts/includes/deployment.sh @@ -2374,9 +2374,19 @@ if [ -n "$PUPPET" ] ; then grml-chroot "${TARGET}" apt-get -y install dirmngr fi + # puppetlabs doesn't provide packages for Debian/bookworm yet, so use + # the AIO packages from the bullseye repos for now, + puppet_deb_release="${DEBIAN_RELEASE}" + case "${DEBIAN_RELEASE}" in + bookworm) + puppet_deb_release="bullseye" + echo "WARN: enabling ${puppet_deb_release} puppetlabs repository for ${DEBIAN_RELEASE} (see PA-4995)" + ;; + esac + echo "Installing 'puppet-agent' with dependencies" cat >> ${TARGET}/etc/apt/sources.list.d/puppetlabs.list << EOF -deb ${DEBIAN_URL}/puppetlabs/ ${DEBIAN_RELEASE} main puppet dependencies +deb ${DEBIAN_URL}/puppetlabs/ ${puppet_deb_release} main puppet dependencies EOF puppet_gpg='/root/puppet.gpg'