From: Thomas F Herbert <therbert@redhat.com>
Date: Fri, 12 Feb 2016 00:28:34 +0000 (-0500)
Subject: Fix for problem found in daily build where virsh reboot failed.
X-Git-Tag: colorado.1.0~44
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=ovsnfv.git;a=commitdiff_plain;h=9e14e09a0f1c986d88b239cc683f24bb850807de

Fix for problem found in daily build where virsh reboot failed.
The fix is to run  virsh reboot as user stack

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

diff --git a/build/instack_ovs.sh b/build/instack_ovs.sh
index c4378d9..5af6ccf 100755
--- a/build/instack_ovs.sh
+++ b/build/instack_ovs.sh
@@ -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