Skip to content

Commit a99ab70

Browse files
committed
neutron: Use openvswitch firewall driver by default
openvswitch firewall has been in Neutron tree since Newton and has gone through lots of improvements since including simple upgrade path from the iptables hybrid driver. We have a tempest job running in Neutron tree with openvswitch firewall that's been voting and stable for a while. For neutron_tempest_plugin, we have had the openvswitch firewall in use since the beginning. This patch proposes openvswitch firewall driver to become a default driver for openvswitch agent deployments. Change-Id: If26d0180e459210511f25f1faa83dd8ccea25ff4
1 parent 827f6c1 commit a99ab70

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

lib/neutron

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,8 @@ function configure_neutron_new {
220220
if [[ $NEUTRON_AGENT == "linuxbridge" ]]; then
221221
iniset $NEUTRON_CORE_PLUGIN_CONF securitygroup firewall_driver iptables
222222
iniset $NEUTRON_CORE_PLUGIN_CONF vxlan local_ip $HOST_IP
223-
else
224-
iniset $NEUTRON_CORE_PLUGIN_CONF securitygroup firewall_driver iptables_hybrid
223+
elif [[ $NEUTRON_AGENT == "openvswitch" ]]; then
224+
iniset $NEUTRON_CORE_PLUGIN_CONF securitygroup firewall_driver openvswitch
225225
iniset $NEUTRON_CORE_PLUGIN_CONF ovs local_ip $HOST_IP
226226

227227
if [[ "$NEUTRON_DISTRIBUTED_ROUTING" = "True" ]]; then

lib/neutron_plugins/ovs_base

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ function _neutron_ovs_base_install_agent_packages {
8686

8787
function _neutron_ovs_base_configure_firewall_driver {
8888
if [[ "$Q_USE_SECGROUP" == "True" ]]; then
89-
iniset /$Q_PLUGIN_CONF_FILE securitygroup firewall_driver iptables_hybrid
89+
iniset /$Q_PLUGIN_CONF_FILE securitygroup firewall_driver openvswitch
9090
if ! running_in_container; then
9191
enable_kernel_bridge_firewall
9292
fi

0 commit comments

Comments
 (0)