diff --git a/glance_store/_drivers/cinder.py b/glance_store/_drivers/cinder.py index 66829ea9..dceb512e 100644 --- a/glance_store/_drivers/cinder.py +++ b/glance_store/_drivers/cinder.py @@ -42,14 +42,11 @@ _CINDER_OPTS = [ 'catalog. Format is : separated values of the form: ' '::'), 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', diff --git a/glance_store/_drivers/gridfs.py b/glance_store/_drivers/gridfs.py index 5ce53700..1d858677 100644 --- a/glance_store/_drivers/gridfs.py +++ b/glance_store/_drivers/gridfs.py @@ -45,7 +45,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'), ] diff --git a/glance_store/_drivers/s3.py b/glance_store/_drivers/s3.py index 97aa65bf..cc2f6d4d 100644 --- a/glance_store/_drivers/s3.py +++ b/glance_store/_drivers/s3.py @@ -85,10 +85,8 @@ _S3_OPTS = [ cfg.IntOpt('s3_store_proxy_port', default=8080, help=_('The port to use when connecting over a proxy.')), cfg.StrOpt('s3_store_proxy_user', - default=None, help=_('The username to connect to the proxy.')), cfg.StrOpt('s3_store_proxy_password', secret=True, - default=None, help=_('The password to use when connecting over a proxy.')) ] diff --git a/glance_store/_drivers/swift/store.py b/glance_store/_drivers/swift/store.py index 2e86bd7b..bdf4bbde 100644 --- a/glance_store/_drivers/swift/store.py +++ b/glance_store/_drivers/swift/store.py @@ -62,7 +62,6 @@ _SWIFT_OPTS = [ 'single tenant. This setting is only necessary if the ' 'tenant has multiple swift endpoints.')), cfg.StrOpt('swift_store_endpoint', - default=None, help=_('If set, the configured endpoint will be used. If ' 'None, the storage url from the auth response will be ' 'used.')), diff --git a/glance_store/common/config.py b/glance_store/common/config.py index 3263176c..4d228c4b 100644 --- a/glance_store/common/config.py +++ b/glance_store/common/config.py @@ -107,7 +107,7 @@ common_opts = [ help=_("Deploy the v1 OpenStack Images API.")), cfg.BoolOpt('enable_v2_api', default=True, help=_("Deploy the v2 OpenStack Images 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,