Merge "Removing sdn_l3 and _l2 scenario features"

diff --combined lib/overcloud-deploy-functions.sh
index 1c5e4d0,332a711..e125eb6
--- 1/lib/overcloud-deploy-functions.sh
--- 2/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@@ -36,10 -36,8 +36,8 @@@ function overcloud_deploy 
      elif [ "${deploy_options_array['vpp']}" == 'True' ]; then
        if [ "${deploy_options_array['odl_vpp_netvirt']}" == "True" ]; then
          DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-opendaylight-netvirt-vpp.yaml"
-       elif [ "${deploy_options_array['sdn_l3']}" == "True" ]; then
-         DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-opendaylight-honeycomb.yaml"
        else
-         DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-opendaylight-honeycomb-l2.yaml"
+         DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-opendaylight-honeycomb.yaml"
        fi
      else
        DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-opendaylight.yaml"
@@@ -122,6 -120,7 +120,6 @@@ EO
        ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
        LIBGUESTFS_BACKEND=direct virt-customize \
           --run-command "systemctl enable zrpcd" \
 -         --run-command "systemctl enable bgpd" \
           -a overcloud-full.qcow2
  EOI
    fi

diff --combined lib/undercloud-functions.sh
index d324b0b,425ef42..3bd0341
--- 1/lib/undercloud-functions.sh
--- 2/lib/undercloud-functions.sh
+++ b/lib/undercloud-functions.sh
@@@ -135,12 -135,10 +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
@@@ -196,6 -194,13 +194,6 @@@ sudo sed -i '/CephClusterFSID:/c\\  Cep
  sudo sed -i '/CephMonKey:/c\\  CephMonKey: \\x27'"\$(ceph-authtool --gen-print-key)"'\\x27' /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml
  sudo sed -i '/CephAdminKey:/c\\  CephAdminKey: \\x27'"\$(ceph-authtool --gen-print-key)"'\\x27' /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml
  
 -#####
 -# TEMP WORKAROUND, REMOVE WHEN SNAPS SUPPORTS GLANCE API v2
 -# JIRA: SNAPS-66
 -#####
 -sudo sed -i '/glance::api::enable_v1_api/ s/false/true/' -i /usr/share/openstack-tripleo-heat-templates/puppet/services/glance-api.yaml
 -
 -
  openstack undercloud install &> apex-undercloud-install.log || {
      # cat the undercloud install log incase it fails
      echo "ERROR: openstack undercloud install has failed. Dumping Log:"