...
|
...
|
@@ -371,14 +371,19 @@ if [ "$WAIT_TILL_LAUNCH" = "1" ] && [ -e ~/.ssh/id_rsa.pub ] && [ "$COPYENV" =
|
371
|
371
|
done
|
372
|
372
|
echo -n "devstack service is running, waiting for stack.sh to start logging..."
|
373
|
373
|
|
374
|
|
- while ! ssh_no_check -q stack@$OS_VM_MANAGEMENT_ADDRESS "test -e /tmp/devstack/log/stack.log"; do
|
375
|
|
- sleep 10
|
376
|
|
- done
|
377
|
|
- set -x
|
378
|
|
-
|
379
|
374
|
pid=`ssh_no_check -q stack@$OS_VM_MANAGEMENT_ADDRESS "cat /opt/stack/run_sh.pid"`
|
380
|
|
- ssh_no_check -q stack@$OS_VM_MANAGEMENT_ADDRESS "tail --pid $pid -n +1 -f /tmp/devstack/log/stack.log"
|
|
375
|
+ if [ -n "$SCREEN_LOGDIR" ]; then
|
|
376
|
+ while ! ssh_no_check -q stack@$OS_VM_MANAGEMENT_ADDRESS "test -e ${SCREEN_LOGDIR}/stack.log"; do
|
|
377
|
+ sleep 10
|
|
378
|
+ done
|
|
379
|
+
|
|
380
|
+ ssh_no_check -q stack@$OS_VM_MANAGEMENT_ADDRESS "tail --pid $pid -n +1 -f ${SCREEN_LOGDIR}/stack.log"
|
|
381
|
+ else
|
|
382
|
+ echo -n "SCREEN_LOGDIR not set; just waiting for process $pid to finish"
|
|
383
|
+ ssh_no_check -q stack@$OS_VM_MANAGEMENT_ADDRESS "wait $pid"
|
|
384
|
+ fi
|
381
|
385
|
|
|
386
|
+ set -x
|
382
|
387
|
# Fail if devstack did not succeed
|
383
|
388
|
ssh_no_check -q stack@$OS_VM_MANAGEMENT_ADDRESS 'test -e /opt/stack/runsh.succeeded'
|
384
|
389
|
|