Merge "devstack fixes for linuxbridge"

Code Issues Proposed changes

This commit is contained in:

Jenkins

2017年10月09日 14:35:10 +00:00

committed by Gerrit Code Review

parent 07356d6d22 f6d7d61508

commit ca1a955b7e

2 changed files with 11 additions and 5 deletions

@@ -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

if is_service_enabled h-eng;then

echo_summary "Enabling bgpvpn in $HEAT_CONF"

@@ -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