diff --git a/global/overlay/etc/cosmos/apt/SHA1SUM b/global/overlay/etc/cosmos/apt/SHA1SUM deleted file mode 100644 index 663473c..0000000 --- a/global/overlay/etc/cosmos/apt/SHA1SUM +++ /dev/null @@ -1,6 +0,0 @@ -c8c591fc7bcc54c4a7cf35759ee35ef11936b9a8 puppetlabs-release_1.0-12_all.deb -d69b9a005a604a6739dbcf2524de53fdd93f135f puppetlabs-release_1.1-1_all.deb -761a213324fd1bfa7bc76dc46d6a58b29f17b1a3 puppetlabs-release-pc1_1.1.0-4xenial_all.deb -cfead6a6242a5407ea45ca9dd148c0e694df9ff8 puppetlabs-release-pc1_1.1.0-5yakkety_all.deb -f0c104d210956b4a934076b49fb124107237a4ca puppetlabs-release-pc1_1.1.0-5stretch_all.deb - diff --git a/global/overlay/etc/cosmos/apt/puppetlabs-release-jessie.deb b/global/overlay/etc/cosmos/apt/puppetlabs-release-jessie.deb deleted file mode 100644 index 2ca91fa..0000000 Binary files a/global/overlay/etc/cosmos/apt/puppetlabs-release-jessie.deb and /dev/null differ diff --git a/global/overlay/etc/cosmos/apt/puppetlabs-release-stretch.deb b/global/overlay/etc/cosmos/apt/puppetlabs-release-stretch.deb deleted file mode 100644 index b5ce6d6..0000000 Binary files a/global/overlay/etc/cosmos/apt/puppetlabs-release-stretch.deb and /dev/null differ diff --git a/global/overlay/etc/cosmos/apt/puppetlabs-release-trusty.deb b/global/overlay/etc/cosmos/apt/puppetlabs-release-trusty.deb deleted file mode 100644 index 2d924af..0000000 Binary files a/global/overlay/etc/cosmos/apt/puppetlabs-release-trusty.deb and /dev/null differ diff --git a/global/overlay/etc/cosmos/apt/puppetlabs-release-xenial.deb b/global/overlay/etc/cosmos/apt/puppetlabs-release-xenial.deb deleted file mode 100644 index fdb4cd4..0000000 Binary files a/global/overlay/etc/cosmos/apt/puppetlabs-release-xenial.deb and /dev/null differ diff --git a/global/overlay/etc/cosmos/apt/puppetlabs-release-yakkety.deb b/global/overlay/etc/cosmos/apt/puppetlabs-release-yakkety.deb deleted file mode 100644 index 197e5b9..0000000 Binary files a/global/overlay/etc/cosmos/apt/puppetlabs-release-yakkety.deb and /dev/null differ diff --git a/global/pre-tasks.d/030puppet b/global/pre-tasks.d/030puppet index ef08016..1a7f69a 100755 --- a/global/pre-tasks.d/030puppet +++ b/global/pre-tasks.d/030puppet @@ -8,16 +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}'` - 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 - dpkg -i $puppetdeb apt-get update - apt-get -y install puppet-common + apt-get -y install puppet mkdir -p `dirname $stamp` touch $stamp