diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-08-23 20:04:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-08-23 20:04:20 +0000 |
| commit | 44512748bc6fa8dd24ae57643d368675aee29e4e (patch) | |
| tree | e3378b87e18d0a012ad3ea8ae6dd101d8899bf14 /etc/nova | |
| parent | 53de1a112c1c159a4528666bc3d938345a525bd5 (diff) | |
| parent | 5f7b253fa6db2a8a40d3cc0dd34f16e4281b5937 (diff) | |
Merge "Re-work the handling of firewall_driver default"
Diffstat (limited to 'etc/nova')
| -rw-r--r-- | etc/nova/nova.conf.sample | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/etc/nova/nova.conf.sample b/etc/nova/nova.conf.sample index d3ad9f8a9..d31d1e9e6 100644 --- a/etc/nova/nova.conf.sample +++ b/etc/nova/nova.conf.sample @@ -288,9 +288,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, @@ -1363,6 +1360,10 @@ ######## defined in nova.virt.firewall ######## +# firewall_driver=<None> +#### (StrOpt) Firewall driver (defaults to hypervisor specific iptables +#### driver) + # allow_same_net_traffic=true #### (BoolOpt) Whether to allow network traffic from same network |