Run clean.sh scripts with sudo and set relative path

[ovsnfv.git] / build / instack_ovs.sh

diff --git a/build/instack_ovs.sh b/build/instack_ovs.sh
index c4378d9..83b141c 100755 (executable)
--- a/build/instack_ovs.sh
+++ b/build/instack_ovs.sh
@@ -194,7 +194,7 @@ fi
 sudo rm -f /tmp/instack.answers
 
 # ensure that no previous undercloud VMs are running
-clean.sh
+sudo ../ci/clean.sh
 # and rebuild the bare undercloud VMs
 ssh -T ${SSH_OPTIONS[@]} stack@localhost <<EOI
     set -e
@@ -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