From 5f7b253fa6db2a8a40d3cc0dd34f16e4281b5937 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Thu, 23 Aug 2012 11:22:59 +0100 Subject: Re-work the handling of firewall_driver default Fixes bug #1040430 We have a different default firewall driver for libvirt and xenapi, yet the sample config file currently contains: firewall_driver=nova.virt.firewall.IptablesFirewallDriver In the case of libvirt, it should actually be: firewall_driver=nova.virt.firewall.libvirt.IptablesFirewallDriver This is really easy for users to get confused about. Since we don't have a different sample config file for each hypervisor, the best we can do is to just not include the default in the sample config and have each hypervisor supply its default at runtime. DocImpact: update nova.conf docs Change-Id: Ie78371bcceac5a65978d695934e0246022f748a3 --- etc/nova/nova.conf.sample | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'etc') diff --git a/etc/nova/nova.conf.sample b/etc/nova/nova.conf.sample index ede3003cb..9772c0262 100644 --- a/etc/nova/nova.conf.sample +++ b/etc/nova/nova.conf.sample @@ -250,9 +250,6 @@ # scheduler_manager=nova.scheduler.manager.SchedulerManager #### (StrOpt) full class name for the Manager for scheduler -# firewall_driver=nova.virt.firewall.IptablesFirewallDriver -#### (StrOpt) Firewall driver (defaults to iptables) - # host=nova #### (StrOpt) Name of this node. This can be an opaque identifier. It is #### not necessarily a hostname, FQDN, or IP address. However, @@ -1325,6 +1322,10 @@ ######## defined in nova.virt.firewall ######## +# firewall_driver= +#### (StrOpt) Firewall driver (defaults to hypervisor specific iptables +#### driver) + # allow_same_net_traffic=true #### (BoolOpt) Whether to allow network traffic from same network -- cgit