opendev/system-config
Code Issues Proposed changes

Clean up bashate failures

Browse Source 
Fix all of the bashate failures.  Also, bashate will install its negative
tests in its virtualenv, so we need to generate a list of files to pass to
bashate that excludes .tox/

Change-Id: I55559bf6137f705aec9a7f277928ad8d4cadc2ca
This commit is contained in:
K Jonathan Harker
2014-09-03 19:06:12 -07:00
parent e30f37376d
commit 948aff1f02
10 changed files with 283 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
run_puppet.sh
View File

@@ -1,9 +1,9 @@
#!/bin/bash
if ! test -z $1 ; then
BASE_DIR=$1
BASE_DIR=$1
else
BASE_DIR=`pwd`
BASE_DIR=`pwd`
fi
MODULE_DIR=${BASE_DIR}/modules
@@ -12,5 +12,5 @@ MANIFEST_LOG=/var/log/manifest.log
cd $BASE_DIR
/usr/bin/git pull -q && \
/bin/bash install_modules.sh && \
/usr/bin/puppet apply -l $MANIFEST_LOG --modulepath=$MODULE_PATH manifests/site.pp
/bin/bash install_modules.sh && \
/usr/bin/puppet apply -l $MANIFEST_LOG --modulepath=$MODULE_PATH manifests/site.pp