x
/
monasca-vagrant
Code Issues Proposed changes

Minor update to devstack build script 

Upstream stack.sh again changed its output slightly, so autostack.sh
needs a corresponding change so that it knows when stack.sh completes.

Change-Id: If10c17392af98e4ac6c814df145fe2d2e9f6bc6c
This commit is contained in:
David Schroeder 2015-07-13 09:21:35 -06:00
parent 425faaad12
commit 31a3d7f75c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ds-build/roles/devstack-build/files/autostack.sh
View File

@ -38,15 +38,15 @@ echo "Running stack.sh (this will take a while, output in $log)"
su $unpriv_user -c $basedir/devstack/stack.sh 2>&1 &
# Wait for stack.sh to complete by watching the log file for $donestring
donestring='This is your host ip'
donestring='This is your host IP'
# Sometimes, 'git clone' fails, and this can be retried
retrystring='git call failed: \[git clone'
success=0
while [ "$success" = 0 ]; do
if [ `tail -5 $log 2>/dev/null |grep -c "$donestring"` = 1 ]; then
if [ `tail -6 $log 2>/dev/null |grep -c "$donestring"` -gt 0 ]; then
success=1
elif [ `tail -2 $log 2>/dev/null |grep -c "$retrystring"` = 1 ]; then
elif [ `tail -2 $log 2>/dev/null |grep -c "$retrystring"` -gt 0 ]; then
pkill -f devstack/stack.sh
su $unpriv_user -c $basedir/devstack/stack.sh 2>&1 &
fi