Merge "Discontinue obsolete run-sonar trigger macro"

[releng/builder.git] / jjb / ovsdb / include-setup-hwvtep-docker.sh

diff --git a/jjb/ovsdb/include-setup-hwvtep-docker.sh b/jjb/ovsdb/include-setup-hwvtep-docker.sh
index 7042ef5f19ba9e74cd0a0ef9efe9d448435d9447..7860c4b72721a80c5ffdf6020d510e759f549b5c 100644 (file)
--- a/jjb/ovsdb/include-setup-hwvtep-docker.sh
+++ b/jjb/ovsdb/include-setup-hwvtep-docker.sh
@@ -3,16 +3,15 @@
 set -e
 
 echo "---> Configuring OVS for HW VTEP Emulator"
-/usr/bin/docker exec $CID supervisorctl stop ovsdb-server
+/usr/bin/docker exec "$CID" supervisorctl stop ovsdb-server
+/usr/bin/docker exec "$CID" supervisorctl start ovsdb-server-vtep
+/usr/bin/docker exec "$CID" ovs-vsctl add-br br-vtep
+/usr/bin/docker exec "$CID" ovs-vsctl add-port br-vtep eth0
+/usr/bin/docker exec "$CID" vtep-ctl add-ps br-vtep
+/usr/bin/docker exec "$CID" vtep-ctl add-port br-vtep eth0
+/usr/bin/docker exec "$CID" vtep-ctl set Physical_Switch br-vtep tunnel_ips=192.168.254.20
+/usr/bin/docker exec "$CID" vtep-ctl set-manager ptcp:6640
 sleep 5
-/usr/bin/docker exec $CID supervisorctl start ovsdb-server-vtep
-/usr/bin/docker exec $CID ovs-vsctl add-br br-vtep
-/usr/bin/docker exec $CID ovs-vsctl add-port br-vtep eth0
-/usr/bin/docker exec $CID vtep-ctl add-ps br-vtep
-/usr/bin/docker exec $CID vtep-ctl add-port br-vtep eth0
-/usr/bin/docker exec $CID vtep-ctl set Physical_Switch br-vtep tunnel_ips=192.168.254.20
-/usr/bin/docker exec $CID vtep-ctl set-manager ptcp:6640
-
 echo "---> Starting OVS HW VTEP Emulator"
-/usr/bin/docker exec $CID supervisorctl start ovs-vtep
-sleep 10
+/usr/bin/docker exec "$CID" supervisorctl start ovs-vtep
+sleep 5