From 1b750a45b25c3764d09a3ddecc9cb2106f4c6f34 Mon Sep 17 00:00:00 2001
From: Isaku Yamahata <isaku.yamahata@gmail.com>
Date: Wed, 12 Jul 2017 06:23:35 +0000
Subject: [PATCH] Revert "Update Full stack config"

This reverts commit eaa9ab1d39406c460c5dc135d4dfdee1c08e8d90.

The mentioned commit causes the gate tempest jobs to run with the new
netvirt, even though some of them are defined to run with the old one.

Change-Id: I4ce69e60ef700739e9e5652cc1fa22cd5b7bc491
---
 devstack/plugin.sh                  | 1 -
 devstack/pre_test_hook.sh           | 5 +----
 tools/configure_for_func_testing.sh | 3 +--
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 9b18525ee..52ef80814 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -81,7 +81,6 @@ if is_service_enabled odl-compute; then
             create_nova_conf_neutron
         fi
         bind_opendaylight_controller
-        sudo ovs-vsctl --may-exist add-br $OVS_BR
         wait_for_active_bridge $OVS_BR $ODL_RETRY_SLEEP_INTERVAL $ODL_BOOT_WAIT
 
         # L3 needs to be configured only for netvirt-ovsdb - in netvirt-vpnservice L3 is configured
diff --git a/devstack/pre_test_hook.sh b/devstack/pre_test_hook.sh
index bee4985c7..8c6429d09 100644
--- a/devstack/pre_test_hook.sh
+++ b/devstack/pre_test_hook.sh
@@ -6,7 +6,6 @@ set -xe
 GATE_DEST=$BASE/new
 DEVSTACK_PATH=$GATE_DEST/devstack
 # for localrc_set
-ODL_NETVIRT_COMMON=odl-neutron-service,odl-restconf-all,odl-aaa-authn
 source $DEVSTACK_PATH/inc/ini-config
 
 case "$ODL_RELEASE_BASE" in
@@ -100,9 +99,7 @@ case "$ODL_RELEASE_BASE" in
         ODL_NETVIRT_KARAF_FEATURE=$ODL_NETVIRT_KARAF_FEATURE,odl-neutron-logger
         ;;
     carbon-snapshot|nitrogen-snapshot)
-        ODL_NETVIRT_KARAF_FEATURE=$ODL_NETVIRT_COMMON,odl-netvirt-openstack,odl-neutron-logger,odl-neutron-hostconfig-ovs
-        ODL_GATE_SERVICE_PROVIDER="netvirt"
-        ODL_MAPPING_KEY="public"
+        ODL_NETVIRT_KARAF_FEATURE=$ODL_NETVIRT_KARAF_FEATURE,odl-neutron-logger,odl-neutron-hostconfig-ovs
         ;;
     *)
         ;;
diff --git a/tools/configure_for_func_testing.sh b/tools/configure_for_func_testing.sh
index 05412da8a..adcb3d348 100755
--- a/tools/configure_for_func_testing.sh
+++ b/tools/configure_for_func_testing.sh
@@ -190,8 +190,7 @@ function _install_opendaylight {
     ODL_NETVIRT_KARAF_FEATURE=odl-neutron-service,odl-restconf-all,odl-aaa-authn,odl-dlux-core,odl-mdsal-apidocs,odl-neutron-logger
     if [[ "$VENV" =~ "fullstack" ]]; then
         # TODO: in future switch to new netvirt
-        ODL_NETVIRT_KARAF_FEATURE=odl-neutron-service,odl-restconf-all,odl-aaa-authn,odl-dlux-core,odl-mdsal-apidocs,odl-netvirt-openstack,odl-neutron-logger
-        ODL_PROVIDER_MAPPINGS=public:${Q_PUBLIC_VETH_INT}
+        ODL_NETVIRT_KARAF_FEATURE=odl-neutron-service,odl-restconf-all,odl-aaa-authn,odl-dlux-core,odl-mdsal-apidocs,odl-ovsdb-openstack,odl-neutron-logger
     fi
     ODL_BOOT_WAIT_URL=controller/nb/v2/neutron/networks
     source $NETWORKING_ODL_DIR/devstack/settings.odl