Remove code specific to OPNFV Colorado JOID

JIRA: MODELS-23

Setup function: removed workaround code to enable ML2 port
functionality in the JOID Colorado release.

Change-Id: If0c2f53b426701682ced97c7045465bbb77ee83c
Signed-off-by: Aimee Ukasick <aimeeu.opensource@gmail.com>

diff --git a/tests/vHello_3Node_Tacker.sh b/tests/vHello_3Node_Tacker.sh
index b78440e..4a8f2bf 100644 (file)
--- a/tests/vHello_3Node_Tacker.sh
+++ b/tests/vHello_3Node_Tacker.sh
@@ -163,12 +163,6 @@ setup () {
 
   dist=`grep DISTRIB_ID /etc/*-release | awk -F '=' '{print $2}'`
   if [ "$dist" == "Ubuntu" ]; then
-    dpkg -l juju
-    if [[ $? -eq 0 ]]; then
-      echo "$0: $(date) JOID workaround for Colorado - enable ML2 port security"
-      juju set neutron-api enable-ml2-port-security=true
-    fi
-
     echo "$0: $(date) Execute tacker-setup.sh in the container"
     sudo docker exec -it tacker /bin/bash /opt/tacker/tacker-setup.sh setup $2
     if [ $? -eq 1 ]; then fail; fi