diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-08-13 11:22:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-08-13 11:22:11 +0000 |
| commit | f6c002c0a8e6c1e82e5ce68f1560ed5fc4b58dff (patch) | |
| tree | f07a089e98a0cb21f02265d379dce9c177227169 /nova/network/manager.py | |
| parent | 6d3c1e7b9417394301dcb560e9df581350e04b1d (diff) | |
| parent | 9304aabeb8b96baab76860e36ae04cd9af28b098 (diff) | |
| download | nova-f6c002c0a8e6c1e82e5ce68f1560ed5fc4b58dff.tar.gz | |
Merge "maint: remove redundant default=None for config options"
Diffstat (limited to 'nova/network/manager.py')
| -rw-r--r-- | nova/network/manager.py | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/nova/network/manager.py b/nova/network/manager.py index ba55b387c5..622125be06 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -84,7 +84,6 @@ QUOTAS = quota.QUOTAS network_opts = [ cfg.StrOpt('flat_network_bridge', - default=None, help='Bridge for simple network instances'), cfg.StrOpt('flat_network_dns', default='8.8.4.4', @@ -93,13 +92,11 @@ network_opts = [ default=False, help='Whether to attempt to inject network setup into guest'), cfg.StrOpt('flat_interface', - default=None, help='FlatDhcp will bridge into this interface if set'), cfg.IntOpt('vlan_start', default=100, help='First VLAN for private networks'), cfg.StrOpt('vlan_interface', - default=None, help='vlans will bridge into this interface if set'), cfg.IntOpt('num_networks', default=1, @@ -123,10 +120,8 @@ network_opts = [ default='fd00::/48', help='Fixed IPv6 address block'), cfg.StrOpt('gateway', - default=None, help='Default IPv4 gateway'), cfg.StrOpt('gateway_v6', - default=None, help='Default IPv6 gateway'), cfg.IntOpt('cnt_vpn_clients', default=0, |