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

add support for a second, local puppet module config file

Browse source
This commit is contained in:
Fredrik Thulin 2019-01-15 13:07:47 +01:00
parent 761963ba2f
commit a2e4c5372f
No known key found for this signature in database
GPG key ID: 2707330D4030CCAD
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,7 @@
#!/bin/bash #!/bin/bash
CONFIG=${CONFIG:=/etc/puppet/cosmos-modules.conf} CONFIG=${CONFIG:=/etc/puppet/cosmos-modules.conf}
LOCALCONFIG=${LOCALCONFIG:=/etc/puppet/cosmos-modules_local.conf}
CACHE_DIR=/var/cache/puppet-modules CACHE_DIR=/var/cache/puppet-modules
MODULES_DIR=${MODULES_DIR:=/etc/puppet/cosmos-modules} MODULES_DIR=${MODULES_DIR:=/etc/puppet/cosmos-modules}
export GNUPGHOME=/etc/cosmos/gnupg export GNUPGHOME=/etc/cosmos/gnupg
@ -13,7 +14,7 @@ stage_module() {
git archive --format=tar --prefix=$1/ $2 | (cd $CACHE_DIR/staging/ && tar xf -) git archive --format=tar --prefix=$1/ $2 | (cd $CACHE_DIR/staging/ && tar xf -)
} }
if [ -f $CONFIG ]; then if [ -f $CONFIG -o $LOCALCONFIG ]; then
if [ ! -d $MODULES_DIR ]; then if [ ! -d $MODULES_DIR ]; then
mkdir -p $MODULES_DIR mkdir -p $MODULES_DIR
fi fi
@ -21,8 +22,11 @@ if [ -f $CONFIG ]; then
mkdir -p $CACHE_DIR/{scm,staging} mkdir -p $CACHE_DIR/{scm,staging}
fi fi
test -f $CONFIG || CONFIG=''
test -f $LOCALCONFIG || LOCALCONFIG=''
# First pass to clone any new modules, and update those marked for updating. # First pass to clone any new modules, and update those marked for updating.
grep -E -v "^#" $CONFIG | ( grep -h -E -v "^#" $CONFIG $LOCALCONFIG | sort | (
while read module src update pattern; do while read module src update pattern; do
# We only support git:// urls and https:// urls atm # We only support git:// urls and https:// urls atm
if [ "${src:0:6}" = "git://" -o "${src:0:8}" = "https://" ]; then if [ "${src:0:6}" = "git://" -o "${src:0:8}" = "https://" ]; then
@ -60,7 +64,7 @@ if [ -f $CONFIG ]; then
# Second pass to verify the signatures on all modules and stage those that # Second pass to verify the signatures on all modules and stage those that
# have good signatures. # have good signatures.
grep -E -v "^#" $CONFIG | ( grep -h -E -v "^#" $CONFIG $LOCALCONFIG | sort | (
while read module src update pattern; do while read module src update pattern; do
# We only support git:// urls atm # We only support git:// urls atm
if [ "${src:0:6}" = "git://" -o "${src:0:8}" = "https://" ]; then if [ "${src:0:6}" = "git://" -o "${src:0:8}" = "https://" ]; then
@ -95,9 +99,9 @@ if [ -f $CONFIG ]; then
# Cleanup removed puppet modules from CACHE_DIR # Cleanup removed puppet modules from CACHE_DIR
for MODULE in $(ls -1 $CACHE_DIR/staging/); do for MODULE in $(ls -1 $CACHE_DIR/staging/); do
if ! grep -E -q "^$MODULE\s+" $CONFIG; then if ! grep -h -E -q "^$MODULE\s+" $CONFIG $LOCALCONFIG; then
rm -rf $CACHE_DIR/{scm,staging}/$MODULE rm -rf $CACHE_DIR/{scm,staging}/$MODULE
fi fi
done done
# Installing verified puppet modules # Installing verified puppet modules