Browse code

Merge "Turn off Nova firewall driver when using Neutron"

Jenkins authored on 2013/11/02 03:50:53
Showing 1 changed files
... ...
@@ -272,6 +272,7 @@ function create_nova_conf_neutron() {
272 272
 
273 273
     if [[ "$Q_USE_SECGROUP" == "True" ]]; then
274 274
         LIBVIRT_FIREWALL_DRIVER=nova.virt.firewall.NoopFirewallDriver
275
+        iniset $NOVA_CONF DEFAULT firewall_driver $LIBVIRT_FIREWALL_DRIVER
275 276
         iniset $NOVA_CONF DEFAULT security_group_api neutron
276 277
     fi
277 278