Browse code

Merge "Fix stevedore warning with neutron firewall_driver"

Jenkins authored on 2016/11/08 13:09:31
Showing 1 changed files
... ...
@@ -83,10 +83,10 @@ function _neutron_ovs_base_configure_debug_command {
83 83
 
84 84
 function _neutron_ovs_base_configure_firewall_driver {
85 85
     if [[ "$Q_USE_SECGROUP" == "True" ]]; then
86
-        iniset /$Q_PLUGIN_CONF_FILE securitygroup firewall_driver neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
86
+        iniset /$Q_PLUGIN_CONF_FILE securitygroup firewall_driver iptables_hybrid
87 87
         enable_kernel_bridge_firewall
88 88
     else
89
-        iniset /$Q_PLUGIN_CONF_FILE securitygroup firewall_driver neutron.agent.firewall.NoopFirewallDriver
89
+        iniset /$Q_PLUGIN_CONF_FILE securitygroup firewall_driver noop
90 90
     fi
91 91
 }
92 92