diff --git a/global/pre-tasks.d/030puppet b/global/pre-tasks.d/030puppet index 4d8814ae..7d84d1d5 100755 --- a/global/pre-tasks.d/030puppet +++ b/global/pre-tasks.d/030puppet @@ -8,16 +8,11 @@ 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}'` - #puppetdeb="$COSMOS_REPO/apt/puppetlabs-release-${codename}.deb" - #if [ ! -f $puppetdeb ]; then - # echo "$0: Puppet deb for release $codename not found in $COSMOS_REPO/apt/" - # echo " Get it from https://apt.puppetlabs.com/ and put it in the Cosmos repo." - # exit 1 - #fi - ## The key currently in use does not appear to actually be installed with $puppetdeb - #test -f apt-key add $COSMOS_REPO/apt/keys/puppetlabs-EF8D349F.pub && apt-key add $COSMOS_REPO/apt/keys/puppetlabs-EF8D349F.pub - #dpkg -i $puppetdeb + 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