Merge "Upgrade golang 1.11.5"

[releng/builder.git] / packer / provision / mininet-ovs-2.6.sh

diff --git a/packer/provision/mininet-ovs-2.6.sh b/packer/provision/mininet-ovs-2.6.sh
index 5e32c1179d9f1b16013a6bbb0bb9e1ec8f695bed..6673762bc1e0dda6a23d30dce0288d66949ce34f 100644 (file)
--- a/packer/provision/mininet-ovs-2.6.sh
+++ b/packer/provision/mininet-ovs-2.6.sh
@@ -34,8 +34,11 @@ echo '---> Waiting 15 secs for services to start'
 sleep 15
 ovs-vsctl --version
 ovs-vsctl show
-ps -elf|grep ovs
-ps -elf|grep vtep
+# We want to see the entire ps output not just the pid
+# shellcheck disable=SC2009
+ps -elf | grep ovs
+# shellcheck disable=SC2009
+ps -elf | grep vtep
 echo '---> Finished installing OpenVSwitch 2.6.1'
 
 echo '---> Installing mininet'
@@ -63,16 +66,3 @@ apt-get install vlan
 
 # Install netaddr package which is needed by some custom mininet topologies
 apt-get install python-netaddr
-
-# Check out quagga , compile and install for router functionalities
-echo "Installing the Quagga..."
-mkdir -p /tmp/build_quagga
-cd /tmp/build_quagga
-git clone https://github.com/6WIND/zrpcd.git
-cd zrpcd
-git checkout 20170731
-chmod a+x /tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh
-/tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh -d -b -t
-
-# Removing the build_quagga folder
-rm -rf /tmp/build_quagga/