commit 4ab984b3c78c4ce88772afc81407cd409378bbfa
author cmo <breezestars@gmail.com> Fri Jun 14 16:06:12 2019 +0800
committer Carmelo Cascone <carmelo@opennetworking.org> Wed Jun 19 21:04:23 2019 +0000
tree 2910beeb8993d7a34306d990ea9911edefc844e2
parent 395b23170c58975808d6043ef33a58e419ec7069

Fix p4vm script to export ova and tutorial script

- Modify missing command in tutorial-bootstrap.sh
- Modify command order in ova-cleanup.sh
- Modify the way to execute ovs-cleanup.sh in vm

Change-Id: Ib010d07b31d9b06f3c4b04d34b2036c0058ca300
(cherry picked from commit f1a04004363d2c59108ad3ca9277c09ec1a2167a)

tools/dev/p4vm/export-ova.sh

diff --git a/tools/dev/p4vm/export-ova.sh b/tools/dev/p4vm/export-ova.sh
index d7d8447..96500f2 100755
--- a/tools/dev/p4vm/export-ova.sh
+++ b/tools/dev/p4vm/export-ova.sh
@@ -70,9 +70,7 @@
 fi
 
 # Cleanup
-sshpass -p 'rocks' \
-    ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no \
-    -p ${SSH_PORT} sdn@127.0.0.1 "bash /vagrant/ova-cleanup.sh"
+vagrant ssh -c 'bash /vagrant/ova-cleanup.sh' ${VM_TYPE}
 sleep 5
 vboxmanage controlvm ${VB_UUID} acpipowerbutton
 wait_vm_shutdown ${VB_UUID}