update pre-task for puppet

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