From cd2dabc07f77f98c901d524f7c03cbac04816249 Mon Sep 17 00:00:00 2001
From: Michael Prokop <mprokop@sipwise.com>
Date: Fri, 13 Jun 2025 23:51:19 +0200
Subject: [PATCH] MT#56773 deployment.sh: use recent packages of puppetlabs for
 Debian/bookworm

Nowadays puppetlabs upstream provides the puppet-agent package
for Debian/bookworm, so we no longer need to work around this
by installing the puppet-agent package from bullseye on bookworm
systems.

Change-Id: Iad081fa02f4fb619330177c38673c86db60f2034
---
 templates/scripts/includes/deployment.sh | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/templates/scripts/includes/deployment.sh b/templates/scripts/includes/deployment.sh
index 3646988..dd4f4ef 100755
--- a/templates/scripts/includes/deployment.sh
+++ b/templates/scripts/includes/deployment.sh
@@ -2471,19 +2471,9 @@ 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/ ${puppet_deb_release} main puppet dependencies
+deb ${DEBIAN_URL}/puppetlabs/ ${DEBIAN_RELEASE} main puppet dependencies
 EOF
 
   puppet_gpg='/root/puppet.gpg'