Merge "Removing sdn_l3 and _l2 scenario features"

[apex.git] / lib / undercloud-functions.sh

diff --git a/lib/undercloud-functions.sh b/lib/undercloud-functions.sh
index d324b0b..3bd0341 100755 (executable)
--- a/lib/undercloud-functions.sh
+++ b/lib/undercloud-functions.sh
@@ -135,12 +135,10 @@ function configure_undercloud {
   scp ${SSH_OPTIONS[@]} $APEX_TMP_DIR/network-environment.yaml "stack@$UNDERCLOUD":
 
   # check for ODL L3/ONOS
-  if [ "${deploy_options_array['sdn_l3']}" == 'True' ]; then
-    if [ "${deploy_options_array['dataplane']}" == 'fdio' ]; then
-      ext_net_type=vpp_interface
-    else
-      ext_net_type=br-ex
-    fi
+  if [ "${deploy_options_array['dataplane']}" == 'fdio' ]; then
+    ext_net_type=vpp_interface
+  else
+    ext_net_type=br-ex
   fi
 
   if [ "${deploy_options_array['dataplane']}" == 'ovs_dpdk' ]; then