Browse code

bug 924267: Explicitly set firewall_driver to nova.virt.libvirt.firewall.IptablesFirewallDriver

Because of https://bugs.launchpad.net/nova/+bug/924266, the default firewall_driver should
not be the libvirt's one. So set the driver explicitly.

Change-Id: I1e6a0d824e857bb082eef2a684445241d4c31aae

Armando Migliaccio authored on 2012/01/31 23:33:19
Showing 2 changed files
... ...
@@ -1,6 +1,7 @@
1 1
 Adam Gandelman <adamg@canonical.com>
2 2
 Andy Smith <github@anarkystic.com>
3 3
 Anthony Young <sleepsonthefloor@gmail.com>
4
+Armando Migliaccio <armando.migliaccio@eu.citrix.com>
4 5
 Brad Hall <brad@nicira.com>
5 6
 Chmouel Boudjnah <chmouel@chmouel.com>
6 7
 Dean Troyer <dtroyer@gmail.com>
... ...
@@ -1235,6 +1235,8 @@ if [ "$VIRT_DRIVER" = 'xenserver' ]; then
1235 1235
     add_nova_flag "--firewall_driver=$XEN_FIREWALL_DRIVER"
1236 1236
 else
1237 1237
     add_nova_flag "--connection_type=libvirt"
1238
+    LIBVIRT_FIREWALL_DRIVER=${LIBVIRT_FIREWALL_DRIVER:-"nova.virt.libvirt.firewall.IptablesFirewallDriver"}
1239
+    add_nova_flag "--firewall_driver=$LIBVIRT_FIREWALL_DRIVER"
1238 1240
     add_nova_flag "--flat_network_bridge=$FLAT_NETWORK_BRIDGE"
1239 1241
     if [ -n "$FLAT_INTERFACE" ]; then
1240 1242
         add_nova_flag "--flat_interface=$FLAT_INTERFACE"