SUNET/rut-test-ops
11
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #33 from SUNET/feature-ft-tinkering

Browse source 
tinkering
This commit is contained in:
Johan Wassberg 2023-02-03 16:10:54 +01:00 committed by GitHub
parent 948cc80389 708c6c1b64
commit 8599d395c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
global/post-tasks.d/030puppet
View file

@ -1,13 +1,15 @@
#!/bin/sh #!/bin/sh
set -e
if [ "x$COSMOS_VERBOSE" = "xy" ]; then if [ "x$COSMOS_VERBOSE" = "xy" ]; then
args="--verbose --show_diff" args="--verbose --show_diff"
else else
args="--logdest=syslog" args="--logdest=syslog"
fi fi
if [ -f /usr/bin/puppet -a -d /etc/puppet/manifests ]; then if [ -f /usr/bin/puppet ] && [ -d /etc/puppet/manifests ]; then
for m in `find /etc/puppet/manifests -name \*.pp`; do find /etc/puppet/manifests -name \*.pp | while read -r m; do
test "x$COSMOS_VERBOSE" = "xy" && echo "$0: Applying Puppet manifest $m" test "x$COSMOS_VERBOSE" = "xy" && echo "$0: Applying Puppet manifest $m"
puppet apply $args $m puppet apply $args $m
done done

6
global/pre-tasks.d/015set-overlay-permissions
View file

@ -15,5 +15,9 @@ if ! test -d "$MODEL_OVERLAY"; then
fi fi
if [ -d "$MODEL_OVERLAY/root" ]; then if [ -d "$MODEL_OVERLAY/root" ]; then
chmod -v 0700 "$MODEL_OVERLAY"/root args=""
if [ "x$COSMOS_VERBOSE" = "xy" ]; then
args="-v"
fi
chmod ${args} 0700 "$MODEL_OVERLAY"/root
fi fi