Change-Id: I5b9d07493eb334169fb2643047a014f56ee265fa
| ... | ... |
@@ -236,6 +236,12 @@ SNAME_PREPARED="template_prepared" |
| 236 | 236 |
SNAME_FIRST_BOOT="before_first_boot" |
| 237 | 237 |
|
| 238 | 238 |
function wait_for_VM_to_halt() {
|
| 239 |
+ set +x |
|
| 240 |
+ echo "Waiting for the VM to halt. Progress in-VM can be checked with vncviewer:" |
|
| 241 |
+ mgmt_ip=$(echo $XENAPI_CONNECTION_URL | tr -d -c '1234567890.') |
|
| 242 |
+ domid=$(xe vm-list name-label="$GUEST_NAME" params=dom-id minimal=true) |
|
| 243 |
+ port=$(xenstore-read /local/domain/$domid/console/vnc-port) |
|
| 244 |
+ echo "vncviewer -via $mgmt_ip localhost:${port:2}"
|
|
| 239 | 245 |
while true |
| 240 | 246 |
do |
| 241 | 247 |
state=$(xe_min vm-list name-label="$GUEST_NAME" power-state=halted) |
| ... | ... |
@@ -243,10 +249,11 @@ function wait_for_VM_to_halt() {
|
| 243 | 243 |
then |
| 244 | 244 |
break |
| 245 | 245 |
else |
| 246 |
- echo "Waiting for "$GUEST_NAME" to finish installation..." |
|
| 246 |
+ echo -n "." |
|
| 247 | 247 |
sleep 20 |
| 248 | 248 |
fi |
| 249 | 249 |
done |
| 250 |
+ set -x |
|
| 250 | 251 |
} |
| 251 | 252 |
|
| 252 | 253 |
templateuuid=$(xe template-list name-label="$TNAME") |
| ... | ... |
@@ -405,12 +412,14 @@ if [ "$WAIT_TILL_LAUNCH" = "1" ] && [ -e ~/.ssh/id_rsa.pub ] && [ "$COPYENV" = |
| 405 | 405 |
# Fail if the expected text is not found |
| 406 | 406 |
ssh_no_check -q stack@$DOMU_IP 'cat run.sh.log' | grep -q 'stack.sh completed in' |
| 407 | 407 |
|
| 408 |
+ set +x |
|
| 408 | 409 |
echo "################################################################################" |
| 409 | 410 |
echo "" |
| 410 | 411 |
echo "All Finished!" |
| 411 | 412 |
echo "You can visit the OpenStack Dashboard" |
| 412 | 413 |
echo "at http://$DOMU_IP, and contact other services at the usual ports." |
| 413 | 414 |
else |
| 415 |
+ set +x |
|
| 414 | 416 |
echo "################################################################################" |
| 415 | 417 |
echo "" |
| 416 | 418 |
echo "All Finished!" |