remove default=None for config options

In the cfg module default=None is set as the default value.

Change-Id: Iad40a7bacef410e54d684cb438d4459f828f70df
Closes-Bug: #1323975

glance/cmd/cache_manage.py

@@ -381,7 +381,7 @@ def create_options(parser):
                       help=optparse.SUPPRESS_HELP)
 
     parser.add_option('-S', '--os_auth_strategy', dest="os_auth_strategy",
-                      metavar="STRATEGY", default=None,
+                      metavar="STRATEGY",
                       help="Authentication strategy (keystone or noauth).")
 
 

glance/common/config.py

@@ -117,7 +117,7 @@ common_opts = [
                 help=_("Deploy the v1 OpenStack Registry API.")),
     cfg.BoolOpt('enable_v2_registry', default=True,
                 help=_("Deploy the v2 OpenStack Registry API.")),
-    cfg.StrOpt('pydev_worker_debug_host', default=None,
+    cfg.StrOpt('pydev_worker_debug_host',
                help=_('The hostname/IP of the pydev process listening for '
                       'debug connections')),
     cfg.IntOpt('pydev_worker_debug_port', default=5678,

glance/common/property_utils.py

@@ -33,7 +33,6 @@ LOG = logging.getLogger(__name__)
 
 property_opts = [
     cfg.StrOpt('property_protection_file',
-               default=None,
                help=_('The location of the property protection file.')),
     cfg.StrOpt('property_protection_rule_format',
                default='roles',

glance/store/cinder.py

@@ -34,14 +34,11 @@ cinder_opts = [
                     'catalog. Format is: separated values of the form: '
                     '<service_type>:<service_name>:<endpoint_type>.'),
     cfg.StrOpt('cinder_endpoint_template',
-               default=None,
                help='Override service catalog lookup with template for cinder '
                     'endpoint e.g. http://localhost:8776/v1/%(project_id)s.'),
     cfg.StrOpt('os_region_name',
-               default=None,
                help='Region name of this node.'),
     cfg.StrOpt('cinder_ca_certificates_file',
-               default=None,
                help='Location of CA certicates file to use for cinder client '
                     'requests.'),
     cfg.IntOpt('cinder_http_retries',

glance/store/gridfs.py

@@ -42,7 +42,7 @@ gridfs_opts = [
                     "If host is an IPv6 literal it must be enclosed "
                     "in '[' and ']' characters following the RFC2732 "
                     "URL syntax (e.g. '[::1]' for localhost)."),
-    cfg.StrOpt('mongodb_store_db', default=None, help='Database to use.'),
+    cfg.StrOpt('mongodb_store_db', help='Database to use.'),
 ]
 
 CONF = cfg.CONF