summaryrefslogtreecommitdiff
path: root/global/pre-tasks.d
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordu.net>2017-07-28 15:14:03 +0200
committerLinus Nordberg <linus@nordu.net>2017-07-28 15:14:03 +0200
commit4223da5ae4d440774e350a8489b7d4bd0fe38c11 (patch)
treeabf75b36f7b066f8dcf674fc8decb473c1585d15 /global/pre-tasks.d
parent883c92a407ad1db7925eec9bab483b06d12aa5a7 (diff)
Update from sunet/multiverse.ct-ops-2017-07-28-v01
Diffstat (limited to 'global/pre-tasks.d')
-rwxr-xr-xglobal/pre-tasks.d/030puppet10
1 files changed, 7 insertions, 3 deletions
diff --git a/global/pre-tasks.d/030puppet b/global/pre-tasks.d/030puppet
index cdc9989..ef08016 100755
--- a/global/pre-tasks.d/030puppet
+++ b/global/pre-tasks.d/030puppet
@@ -9,9 +9,13 @@ 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}'`
- wget -c http://apt.puppetlabs.com/puppetlabs-release-${codename}.deb
- dpkg -i puppetlabs-release-${codename}.deb
- rm -f puppetlabs-release-${codename}.deb*
+ 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