From 6ef114c683be1dbbe080d38953b69d7e34114b58 Mon Sep 17 00:00:00 2001 From: "vikram.choudhary" Date: Tue, 24 Jan 2017 14:54:18 +0530 Subject: [PATCH] Renamed [BGP] config section to [bgp] Though oslo.config should not care about the case, it seems like oslo-config-generator creates two separate sections with different case if both are included. Change-Id: I0e9857c893c7a3a2d655fd380e17cd2f3acbf4e2 --- devstack/lib/dr | 4 ++-- neutron_dynamic_routing/services/bgp/common/opts.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/devstack/lib/dr b/devstack/lib/dr index 0b9e83ec..26e5f397 100644 --- a/devstack/lib/dr +++ b/devstack/lib/dr @@ -19,14 +19,14 @@ function configure_dr_agent_bgp_config { cp $NEUTRON_DYNAMIC_ROUTING_DIR/etc/bgp_dragent.ini.sample $DR_AGENT_BGP_CONF_FILE iniset $DR_AGENT_BGP_CONF_FILE DEFAULT verbose True iniset $DR_AGENT_BGP_CONF_FILE DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL - iniset $DR_AGENT_BGP_CONF_FILE BGP bgp_router_id $BGP_ROUTER_ID + iniset $DR_AGENT_BGP_CONF_FILE bgp bgp_router_id $BGP_ROUTER_ID } function configure_dr_agent_bgp_driver { if [ -z "$BGP_SPEAKER_DRIVER" ] ; then BGP_SPEAKER_DRIVER=$RYU_BGP_SPEAKER_DRIVER fi - iniset $DR_AGENT_BGP_CONF_FILE BGP bgp_speaker_driver $BGP_SPEAKER_DRIVER + iniset $DR_AGENT_BGP_CONF_FILE bgp bgp_speaker_driver $BGP_SPEAKER_DRIVER } ############################# diff --git a/neutron_dynamic_routing/services/bgp/common/opts.py b/neutron_dynamic_routing/services/bgp/common/opts.py index c0ee666d..a8b183ff 100644 --- a/neutron_dynamic_routing/services/bgp/common/opts.py +++ b/neutron_dynamic_routing/services/bgp/common/opts.py @@ -20,7 +20,7 @@ import neutron_dynamic_routing.services.bgp.agent.config def list_bgp_agent_opts(): return [ - ('BGP', + ('bgp', itertools.chain( neutron_dynamic_routing.services.bgp.agent. config.BGP_DRIVER_OPTS,