From dc3fb1ce468c0325dcfd2ee73c9e35869278d6c6 Mon Sep 17 00:00:00 2001
From: Gary Kotton <gkotton@vmware.com>
Date: Sun, 28 Feb 2016 01:29:21 -0800
Subject: [PATCH] BGP: remove unnecessary configuration setting

By default oslo CFG sets the default value as None. There is no
need to specifically do this.

The patch also moves the RYU_BGP_SPEAKER_DRIVER to the devstack
settings file.

TrivialFix

Change-Id: Ic33871a0a42fa9a5e5af3158532ecdad9817e5ab
---
 devstack/lib/bgp                     | 2 --
 devstack/settings                    | 4 +++-
 neutron/services/bgp/agent/config.py | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/devstack/lib/bgp b/devstack/lib/bgp
index 364e75be8a7..a0257ed0dae 100644
--- a/devstack/lib/bgp
+++ b/devstack/lib/bgp
@@ -1,5 +1,3 @@
-RYU_BGP_SPEAKER_DRIVER="neutron.services.bgp.driver.ryu.driver.RyuBgpDriver"
-
 function configure_bgp_service_plugin {
     _neutron_service_plugin_class_add "bgp"
 }
diff --git a/devstack/settings b/devstack/settings
index 6e9b67040cb..c9deeecbd5a 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -3,4 +3,6 @@ L2_AGENT_EXTENSIONS=${L2_AGENT_EXTENSIONS:-}
 #BGP binary and config information
 AGENT_BGP_BINARY=${AGENT_BGP_BINARY:-"$NEUTRON_BIN_DIR/neutron-bgp-dragent"}
 Q_BGP_DRAGENT_CONF_FILE=${Q_BGP_DRAGENT_CONF_FILE:-"$NEUTRON_CONF_DIR/bgp_dragent.ini"}
-BGP_ROUTER_ID=${BGP_ROUTER_ID:-}
\ No newline at end of file
+BGP_ROUTER_ID=${BGP_ROUTER_ID:-}
+
+RYU_BGP_SPEAKER_DRIVER="neutron.services.bgp.driver.ryu.driver.RyuBgpDriver"
diff --git a/neutron/services/bgp/agent/config.py b/neutron/services/bgp/agent/config.py
index 18f2d2be264..4256b6477a3 100644
--- a/neutron/services/bgp/agent/config.py
+++ b/neutron/services/bgp/agent/config.py
@@ -19,7 +19,6 @@ from neutron._i18n import _
 
 BGP_DRIVER_OPTS = [
     cfg.StrOpt('bgp_speaker_driver',
-               default=None,
                help=_("BGP speaker driver class to be instantiated."))
 ]