@@ -220,8 +220,8 @@ function configure_neutron_new {

         if [[ $NEUTRON_AGENT == "linuxbridge" ]]; then

             iniset $NEUTRON_CORE_PLUGIN_CONF securitygroup firewall_driver iptables

             iniset $NEUTRON_CORE_PLUGIN_CONF vxlan local_ip $HOST_IP

-        else

-            iniset $NEUTRON_CORE_PLUGIN_CONF securitygroup firewall_driver iptables_hybrid

+        elif [[ $NEUTRON_AGENT == "openvswitch" ]]; then

+            iniset $NEUTRON_CORE_PLUGIN_CONF securitygroup firewall_driver openvswitch

             iniset $NEUTRON_CORE_PLUGIN_CONF ovs local_ip $HOST_IP

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

@@ -86,7 +86,7 @@ function _neutron_ovs_base_install_agent_packages {

 function _neutron_ovs_base_configure_firewall_driver {

     if [[ "$Q_USE_SECGROUP" == "True" ]]; then

-        iniset /$Q_PLUGIN_CONF_FILE securitygroup firewall_driver iptables_hybrid

+        iniset /$Q_PLUGIN_CONF_FILE securitygroup firewall_driver openvswitch

         if ! running_in_container; then

             enable_kernel_bridge_firewall

         fi