openstack
/
devstack
Code Issues Proposed changes

Merge "Configure bridge_mappings for ovs and linuxbridge agents"

This commit is contained in:
Jenkins 2017-09-23 01:10:30 +00:00 committed by Gerrit Code Review
parent 672ac22ab3 e3915938f3
commit a08503ab4c
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/neutron
View File

@ -229,6 +229,13 @@ function configure_neutron_new {
configure_root_helper_options $NEUTRON_L3_CONF
iniset $NEUTRON_L3_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL
neutron_plugin_configure_l3_agent $NEUTRON_L3_CONF
# Configure the neutron agent to serve external network ports
if [[ $NEUTRON_AGENT == "linuxbridge" ]]; then
iniset $NEUTRON_CORE_PLUGIN_CONF linux_bridge bridge_mappings "$PUBLIC_NETWORK_NAME:$PUBLIC_BRIDGE"
else
iniset $NEUTRON_CORE_PLUGIN_CONF ovs bridge_mappings "$PUBLIC_NETWORK_NAME:$PUBLIC_BRIDGE"
fi
fi
# Metadata