From ebb2865ff4392685ede0cd0582ec0cf7a87a80e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Bergstr=C3=B6m?= <berra@sunet.se>
Date: Wed, 5 Jul 2023 12:54:50 +0200
Subject: [PATCH] update pre-task for puppet

---
 global/pre-tasks.d/030puppet | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/global/pre-tasks.d/030puppet b/global/pre-tasks.d/030puppet
index 7d84d1d5..709d83c9 100755
--- a/global/pre-tasks.d/030puppet
+++ b/global/pre-tasks.d/030puppet
@@ -8,13 +8,8 @@ set -e
 stamp="$COSMOS_BASE/stamps/puppet-tools-v01.stamp"
 
 if ! test -f $stamp -a -f /usr/bin/puppet; then
-    codename=`lsb_release -c| awk '{print $2}'`
-    for fn in puppetlabs-release-${codename}.deb puppet-release-${codename}.deb; do
-       wget -c http://apt.puppetlabs.com/$fn && dpkg -i $fn
-       rm -f $fn
-    done
     apt-get update
-    apt-get -y install puppet-common
+    apt-get -y install puppet-common || apt-get -y install puppet
 
     mkdir -p `dirname $stamp`
     touch $stamp