openstack
/
devstack
Code Issues Proposed changes

Merge "XenAPI: Recommend using xl console rather than vncviewer"

This commit is contained in:
Jenkins 2015-02-18 12:57:32 +00:00 committed by Gerrit Code Review
parent a804c071b7 e356d8cff6
commit 2e9d32baf2
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/xen/install_os_domU.sh
View File

@ -149,12 +149,10 @@ 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:"
echo "Waiting for the VM to halt. Progress in-VM can be checked with XenCenter or xl console:"
mgmt_ip=$(echo $XENAPI_CONNECTION_URL | tr -d -c '1234567890.')
domid=$(get_domid "$GUEST_NAME")
sleep 20 # Wait for the vnc-port to be written
port=$(xenstore-read /local/domain/$domid/console/vnc-port)
echo "vncviewer -via root@$mgmt_ip localhost:${port:2}"
echo "ssh root@$mgmt_ip \"xl console $domid\""
while true; do
state=$(xe_min vm-list name-label="$GUEST_NAME" power-state=halted)
if [ -n "$state" ]; then