From: Gary Kotton <gkotton@vmware.com>
Date: Mon, 2 Nov 2015 08:41:29 +0000 (-0800)
Subject: Remove default=None for configuration bindings
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=64e25d0299aecc1d6f6d23d59f0993a9986a1544;p=openstack-build%2Fneutron-build.git

Remove default=None for configuration bindings

The default value for a configuration variable is None. There is
no need to specifically set these as None.

The line where this is done is:
https://github.com/openstack/oslo.config/blob/master/oslo_config/cfg.py#L684

TrivialFix

Change-Id: Iedf29b13d69ea9f2eb4d5aa746d7c1da8d83bafc
---

diff --git a/neutron/agent/metadata/config.py b/neutron/agent/metadata/config.py
index bfc211041..67e5e1eb8 100644
--- a/neutron/agent/metadata/config.py
+++ b/neutron/agent/metadata/config.py
@@ -36,7 +36,6 @@ SHARED_OPTS = [
 
 DRIVER_OPTS = [
     cfg.BoolOpt('metadata_proxy_watch_log',
-                default=None,
                 help=_("Enable/Disable log watch by metadata proxy. It "
                        "should be disabled when metadata_proxy_user/group "
                        "is not allowed to read/write its log file and "
diff --git a/neutron/agent/metadata/namespace_proxy.py b/neutron/agent/metadata/namespace_proxy.py
index ed87871c0..1af885d27 100644
--- a/neutron/agent/metadata/namespace_proxy.py
+++ b/neutron/agent/metadata/namespace_proxy.py
@@ -158,11 +158,9 @@ def main():
                    help=_('Location of Metadata Proxy UNIX domain '
                           'socket')),
         cfg.StrOpt('metadata_proxy_user',
-                   default=None,
                    help=_("User (uid or name) running metadata proxy after "
                           "its initialization")),
         cfg.StrOpt('metadata_proxy_group',
-                   default=None,
                    help=_("Group (gid or name) running metadata proxy after "
                           "its initialization")),
         cfg.BoolOpt('metadata_proxy_watch_log',
diff --git a/neutron/common/config.py b/neutron/common/config.py
index b346ba68d..a598f73f4 100644
--- a/neutron/common/config.py
+++ b/neutron/common/config.py
@@ -72,10 +72,10 @@ core_opts = [
                help=_("Maximum number of fixed ips per port. This option "
                       "is deprecated and will be removed in the N "
                       "release.")),
-    cfg.StrOpt('default_ipv4_subnet_pool', default=None,
+    cfg.StrOpt('default_ipv4_subnet_pool',
                help=_("Default IPv4 subnet-pool to be used for automatic "
                       "subnet CIDR allocation")),
-    cfg.StrOpt('default_ipv6_subnet_pool', default=None,
+    cfg.StrOpt('default_ipv6_subnet_pool',
                help=_("Default IPv6 subnet-pool to be used for automatic "
                       "subnet CIDR allocation")),
     cfg.IntOpt('dhcp_lease_duration', default=86400,
@@ -113,7 +113,7 @@ core_opts = [
                 help=_('If True, effort is made to advertise MTU settings '
                        'to VMs via network methods (DHCP and RA MTU options) '
                        'when the network\'s preferred MTU is known.')),
-    cfg.StrOpt('ipam_driver', default=None,
+    cfg.StrOpt('ipam_driver',
                help=_('IPAM driver to use.')),
     cfg.BoolOpt('vlan_transparent', default=False,
                 help=_('If True, then allow plugins that support it to '
diff --git a/neutron/tests/tempest/config.py b/neutron/tests/tempest/config.py
index 200b24736..256d687dd 100644
--- a/neutron/tests/tempest/config.py
+++ b/neutron/tests/tempest/config.py
@@ -73,7 +73,6 @@ IdentityGroup = [
                 default=False,
                 help="Set to True if using self-signed SSL certificates."),
     cfg.StrOpt('ca_certificates_file',
-               default=None,
                help='Specify a CA bundle file to use in verifying a '
                     'TLS (https) server certificate.'),
     cfg.StrOpt('uri',