Merge "Improve millisecond logging"
diff --git a/tools/xen/README.md b/tools/xen/README.md
index f20ad04..1cd45cf 100644
--- a/tools/xen/README.md
+++ b/tools/xen/README.md
@@ -18,7 +18,7 @@
For details on installation, see: http://wiki.openstack.org/XenServer/Install
Here are some sample Xenserver network settings for when you are just
-getting started (I use settings like this with a lappy + cheap wifi router):
+getting started (Settings like this have been used with a laptop + cheap wifi router):
* XenServer Host IP: 192.168.1.10
* XenServer Netmask: 255.255.255.0
@@ -29,9 +29,9 @@
--------------------------
On your XenServer host, run the following commands as root:
-wget --no-check-certificate https://github.com/openstack-dev/devstack/zipball/master
-unzip -o master -d ./devstack
-cd devstack/*/
+ wget --no-check-certificate https://github.com/openstack-dev/devstack/zipball/master
+ unzip -o master -d ./devstack
+ cd devstack/*/
Step 3: Configure your localrc inside the devstack directory
------------------------------------------------------------
diff --git a/tools/xen/install_os_domU.sh b/tools/xen/install_os_domU.sh
index b4fbb69..0e27570 100755
--- a/tools/xen/install_os_domU.sh
+++ b/tools/xen/install_os_domU.sh
@@ -236,6 +236,12 @@
SNAME_FIRST_BOOT="before_first_boot"
function wait_for_VM_to_halt() {
+ set +x
+ echo "Waiting for the VM to halt. Progress in-VM can be checked with vncviewer:"
+ mgmt_ip=$(echo $XENAPI_CONNECTION_URL | tr -d -c '1234567890.')
+ domid=$(xe vm-list name-label="$GUEST_NAME" params=dom-id minimal=true)
+ port=$(xenstore-read /local/domain/$domid/console/vnc-port)
+ echo "vncviewer -via $mgmt_ip localhost:${port:2}"
while true
do
state=$(xe_min vm-list name-label="$GUEST_NAME" power-state=halted)
@@ -243,10 +249,11 @@
then
break
else
- echo "Waiting for "$GUEST_NAME" to finish installation..."
+ echo -n "."
sleep 20
fi
done
+ set -x
}
templateuuid=$(xe template-list name-label="$TNAME")
@@ -405,12 +412,14 @@
# Fail if the expected text is not found
ssh_no_check -q stack@$DOMU_IP 'cat run.sh.log' | grep -q 'stack.sh completed in'
+ set +x
echo "################################################################################"
echo ""
echo "All Finished!"
echo "You can visit the OpenStack Dashboard"
echo "at http://$DOMU_IP, and contact other services at the usual ports."
else
+ set +x
echo "################################################################################"
echo ""
echo "All Finished!"