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
This commit is contained in:
Armando Migliaccio 2012-01-31 14:33:19 +00:00
parent ce05e03213
commit 34f6249f7a
2 changed files with 3 additions and 0 deletions

View File

@ -1,6 +1,7 @@
Adam Gandelman <adamg@canonical.com> Adam Gandelman <adamg@canonical.com>
Andy Smith <github@anarkystic.com> Andy Smith <github@anarkystic.com>
Anthony Young <sleepsonthefloor@gmail.com> Anthony Young <sleepsonthefloor@gmail.com>
Armando Migliaccio <armando.migliaccio@eu.citrix.com>
Brad Hall <brad@nicira.com> Brad Hall <brad@nicira.com>
Chmouel Boudjnah <chmouel@chmouel.com> Chmouel Boudjnah <chmouel@chmouel.com>
Dean Troyer <dtroyer@gmail.com> Dean Troyer <dtroyer@gmail.com>

View File

@ -1235,6 +1235,8 @@ if [ "$VIRT_DRIVER" = 'xenserver' ]; then
add_nova_flag "--firewall_driver=$XEN_FIREWALL_DRIVER" add_nova_flag "--firewall_driver=$XEN_FIREWALL_DRIVER"
else else
add_nova_flag "--connection_type=libvirt" add_nova_flag "--connection_type=libvirt"
LIBVIRT_FIREWALL_DRIVER=${LIBVIRT_FIREWALL_DRIVER:-"nova.virt.libvirt.firewall.IptablesFirewallDriver"}
add_nova_flag "--firewall_driver=$LIBVIRT_FIREWALL_DRIVER"
add_nova_flag "--flat_network_bridge=$FLAT_NETWORK_BRIDGE" add_nova_flag "--flat_network_bridge=$FLAT_NETWORK_BRIDGE"
if [ -n "$FLAT_INTERFACE" ]; then if [ -n "$FLAT_INTERFACE" ]; then
add_nova_flag "--flat_interface=$FLAT_INTERFACE" add_nova_flag "--flat_interface=$FLAT_INTERFACE"