From 25e61a1868b00b0d2b946100b37844dbd48a4d1f Mon Sep 17 00:00:00 2001
From: fumihiko kakuma <kakuma@valinux.co.jp>
Date: Tue, 25 Apr 2017 11:20:57 +0900
Subject: [PATCH] Enable BGP extension in gate_hook.sh instead of
 devstack/settings

This reverts commit "Enable BGP extension" and enables BGP extension
more safely.

It may affect other neutron projects to set NETWORK_API_EXTENSIONS
in devstack/settings.

Change-Id: I0737cb057a93fc17e045a8a2f777bee7ed9b13cf
---
 devstack/settings                                  | 3 ---
 neutron_dynamic_routing/tests/contrib/gate_hook.sh | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/devstack/settings b/devstack/settings
index 4bffdbac..ccbf6fc5 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -7,9 +7,6 @@
 # q-dr-agent -  Add this config flag indicate that dynamic routing agent
 #               will be running
 
-# This enables BGP extension
-NETWORK_API_EXTENSIONS=all
-
 # This can be overridden in the localrc file
 DR_MODE=${DR_MODE:-allinone}
 
diff --git a/neutron_dynamic_routing/tests/contrib/gate_hook.sh b/neutron_dynamic_routing/tests/contrib/gate_hook.sh
index 98375242..b177e41f 100644
--- a/neutron_dynamic_routing/tests/contrib/gate_hook.sh
+++ b/neutron_dynamic_routing/tests/contrib/gate_hook.sh
@@ -28,5 +28,6 @@ then
     sudo chown -R $STACK_USER:$STACK_USER $BASE
 elif [[ "$VENV" == dsvm-api* ]]
 then
+    export DEVSTACK_LOCAL_CONFIG+=$'\n'"NETWORK_API_EXTENSIONS=all"
     $GATE_DEST/devstack-gate/devstack-vm-gate.sh
 fi