Merge "Revert "Make configure_for_func_testing compatible with e.g. Centos""

tools/configure_for_func_testing.sh

@@ -64,9 +64,9 @@ NEUTRON_DIR=${NEUTRON_DIR:=$REPO_BASE/$PROJECT_NAME}
 INSTALL_MYSQL_ONLY=${INSTALL_MYSQL_ONLY:-False}
 # The gate should automatically install dependencies.
 INSTALL_BASE_DEPENDENCIES=${INSTALL_BASE_DEPENDENCIES:-$IS_GATE}
+BUILD_OVS_FROM_SOURCE=${BUILD_OVS_FROM_SOURCE:-True}
 INSTALL_OVN=${INSTALL_OVN:-True}
 OVN_BRANCH=${OVN_BRANCH:-main}
-Q_BUILD_OVS_FROM_GIT=${Q_BUILD_OVS_FROM_GIT:-True}
 OVS_BRANCH=${OVS_BRANCH:-master}
 
 
@@ -103,7 +103,7 @@ function _install_base_deps {
     echo_summary "Installing base dependencies"
 
     INSTALL_TESTONLY_PACKAGES=True
-    if [[ "$Q_BUILD_OVS_FROM_GIT" == "True" ]]; then
+    if [[ "$BUILD_OVS_FROM_SOURCE" == "True" ]]; then
         PACKAGES=$(get_packages general,neutron,q-agt,q-l3)
         # Do not install 'python-' prefixed packages other than
         # python-dev*.  Neutron's functional testing relies on deployment