sunet-cdn/cdn-ops
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

move package install to post-tasks before puppet

Browse source
This commit is contained in:
Leif Johansson 2013-09-03 11:31:05 +02:00
parent 311d525f6f
commit b71aac9793
2 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
global/post-tasks.d/018packages Normal file
View file

@ -0,0 +1,16 @@
#!/bin/sh
python -c "import yaml" 2>/dev/null || apt-get -y install python-yaml
if [ -f /etc/puppet/cosmos-modules.conf ]; then
grep -E -v "^#" /etc/puppet/cosmos-modules.conf | (
cd /etc/puppet/modules && while read module src update; do
if [ ! -d /etc/puppet/modules/$module ]; then
echo $src | grep -q "://" && git clone $src $module || puppet module install $src
else
if [ "x$update" = "xyes" ]; then
echo $src | grep -q "://" && (cd /etc/puppet/modules/$module && git pull -q) || puppet module upgrade $src
fi
fi
done)
fi

15
global/pre-tasks.d/030puppet
View file

@ -18,18 +18,3 @@ if ! test -f $stamp -a -f /usr/bin/puppet; then
mkdir -p `dirname $stamp`
touch $stamp
fi
python -c "import yaml" 2>/dev/null || apt-get -y install python-yaml
if [ -f /etc/puppet/cosmos-modules.conf ]; then
grep -E -v "^#" /etc/puppet/cosmos-modules.conf | (
cd /etc/puppet/modules && while read module src update; do
if [ ! -d /etc/puppet/modules/$module ]; then
echo $src | grep -q "://" && git clone $src $module || puppet module install $src
else
if [ "x$update" = "xyes" ]; then
echo $src | grep -q "://" && (cd /etc/puppet/modules/$module && git pull -q) || puppet module upgrade $src
fi
fi
done)
fi