opendev/system-config
Code Issues Proposed changes

Make /var/run/puppet in apply test

Browse Source 
So that pupet doesn't try to do it on its own (parallel processes
could be racy).

Also, make grep quiet when searching for nodes to apply.

Change-Id: I5012278cfd98c7e3d39ca75794ce97366289d7a1
This commit is contained in:
James E. Blair 2014-07-09 16:22:53 -07:00
parent dce27b9e1c
commit 096b74896a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test.sh
View File

@ -22,7 +22,7 @@ fi
FOUND=0 FOUND=0
for f in `find applytest -name 'puppetapplytest*' -print` ; do for f in `find applytest -name 'puppetapplytest*' -print` ; do
if grep "Node-OS: $CODENAME" $f; then if grep -q "Node-OS: $CODENAME" $f; then
cat applytest/head $f > $f.final cat applytest/head $f > $f.final
FOUND=1 FOUND=1
fi fi
@ -38,6 +38,7 @@ HOST=`echo $HOSTNAME |awk -F. '{ print $1 }'`
echo "127.0.1.1 $HOST.openstack.org $HOST" >> /tmp/hosts echo "127.0.1.1 $HOST.openstack.org $HOST" >> /tmp/hosts
sudo mv /tmp/hosts /etc/hosts sudo mv /tmp/hosts /etc/hosts
sudo mkdir -p /var/run/puppet
find applytest -name 'puppetapplytest*.final' -print0 | \ find applytest -name 'puppetapplytest*.final' -print0 | \
xargs -0 -P $(nproc) -n 1 -I filearg \ xargs -0 -P $(nproc) -n 1 -I filearg \
sudo puppet apply --modulepath=${MODULE_PATH} --noop --verbose --debug filearg > /dev/null sudo puppet apply --modulepath=${MODULE_PATH} --noop --verbose --debug filearg > /dev/null