From c15c4e4eded9233ca866af3470e4894215c6c8f1 Mon Sep 17 00:00:00 2001
From: YAMAMOTO Takashi <yamamoto@midokura.com>
Date: Thu, 1 Dec 2016 20:28:50 +0900
Subject: [PATCH] configure_for_func_testing.sh: Source lib/neutron as well

Also, set ENABLED_SERIVICES before sourcing devstack files
because they uses it.  This is a preparation for an upcoming
change in devstack. [1]

[1] I3ff136fc8330c92007cdfe91b77d7f9865eabd8d

Change-Id: Ida1f83b6b3ef9b76be13c063c7e35a8703214078
---
 tools/configure_for_func_testing.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/configure_for_func_testing.sh b/tools/configure_for_func_testing.sh
index f603b125a5d..228233fec88 100755
--- a/tools/configure_for_func_testing.sh
+++ b/tools/configure_for_func_testing.sh
@@ -171,9 +171,11 @@ EOF
 function _install_agent_deps {
     echo_summary "Installing agent dependencies"
 
+    ENABLED_SERVICES=q-agt,q-dhcp,q-l3
+
+    source $DEVSTACK_PATH/lib/neutron
     source $DEVSTACK_PATH/lib/neutron-legacy
 
-    ENABLED_SERVICES=q-agt,q-dhcp,q-l3
     install_neutron_agent_packages
 }