Fix for problem found in daily build where virsh reboot failed. 37/9837/3
authorThomas F Herbert <therbert@redhat.com>
Fri, 12 Feb 2016 00:28:34 +0000 (19:28 -0500)
committerBilly O'Mahony <billy.o.mahony@intel.com>
Fri, 12 Feb 2016 11:11:36 +0000 (11:11 +0000)
The fix is to run  virsh reboot as user stack

Change-Id: Id762b6d9ec592835805eb69d5244fa1dc2eb8645
Signed-off-by: Thomas F Herbert <therbert@redhat.com>
build/instack_ovs.sh

index c4378d9..5af6ccf 100755 (executable)
@@ -234,13 +234,16 @@ done
 
 # yum update undercloud and reboot.
 ssh -T ${SSH_OPTIONS[@]} "root@$UNDERCLOUD" <<EOI
-set -e
+    set -e
 
-echo yum -y update
-yum -y update
+    echo yum -y update
+    yum -y update
 EOI
 
-virsh reboot instack
+# reboot VM
+ssh -T ${SSH_OPTIONS[@]} stack@localhost <<EOI
+    virsh reboot instack
+EOI
 sleep 30
 
 # yum repo, triple-o package and ssh key setup for the undercloud
@@ -312,7 +315,9 @@ scp ${SSH_OPTIONS[@]} stack@$UNDERCLOUD:instackenv.json stack/instackenv.json
 #
 echo If using special kernel version, reboot undercloud vm
 if [ -z $kernel_version ]; then
-    virsh reboot instack
+    ssh -T ${SSH_OPTIONS[@]} stack@localhost <<EOI
+        virsh reboot instack
+EOI
     sleep 15
 fi