From f6d7d615088bb80e5c120ff5d07298ef7e294bd4 Mon Sep 17 00:00:00 2001 From: Thomas Morin Date: Fri, 6 Oct 2017 14:57:05 +0200 Subject: [PATCH] devstack fixes for linuxbridge Fixes required so that the devstack plugin behaves nicely when used in a setup with linuxbridge, and do not assume that the agent is OVS when its not needed. Change-Id: I2e7bc4303485ea6a0dd0215c624ee3b0883a6589 --- devstack/plugin.sh | 10 ++++++---- devstack/settings | 6 +++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 9cc4c25e..7b467547 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -35,14 +35,16 @@ elif [[ "1ドル" == "stack" && "2ドル" == "post-config" ]]; then iniadd $NETWORKING_BGPVPN_CONF service_providers service_provider $NETWORKING_BGPVPN_DRIVER neutron_server_config_add $NETWORKING_BGPVPN_CONF fi - if is_service_enabled q-agt && is_service_enabled b-bgp && [[ "$Q_AGENT" == "openvswitch" ]]; then - echo_summary "Configuring OVS agent for bagpipe" + if is_service_enabled q-agt && is_service_enabled b-bgp ; then + echo_summary "Configuring agent for bagpipe bgpvpn" plugin_agent_add_l2_agent_extension bagpipe_bgpvpn configure_l2_agent - # l2pop and arp_responder are required for bagpipe driver iniset /$Q_PLUGIN_CONF_FILE agent l2_population True - iniset /$Q_PLUGIN_CONF_FILE agent arp_responder True + if [[ "$Q_AGENT" == "openvswitch" ]]; then + # l2pop and arp_responder are required for bagpipe driver + iniset /$Q_PLUGIN_CONF_FILE agent arp_responder True + fi fi if is_service_enabled h-eng;then echo_summary "Enabling bgpvpn in $HEAT_CONF" diff --git a/devstack/settings b/devstack/settings index 68c143e8..34a5c2eb 100755 --- a/devstack/settings +++ b/devstack/settings @@ -6,6 +6,10 @@ NETWORKING_BGPVPN_DRIVER=${NETWORKING_BGPVPN_DRIVER:-BGPVPN:Dummy:networking_bgp if is_service_enabled q-svc; then # l2pop is currently required for bagpipe driver - Q_ML2_PLUGIN_MECHANISM_DRIVERS="openvswitch,l2population" + if [[ -z "$Q_ML2_PLUGIN_MECHANISM_DRIVERS" ]]; then + Q_ML2_PLUGIN_MECHANISM_DRIVERS="l2population" + else + Q_ML2_PLUGIN_MECHANISM_DRIVERS+=",l2population" + fi fi

AltStyle によって変換されたページ (->オリジナル) /