openstack/nova
Code Issues Proposed changes

Merge "default=None is unneeded in config definitions"

Browse Source
This commit is contained in:
Jenkins 2014-09-16 13:25:48 +00:00 committed by Gerrit Code Review
commit b00da8421c
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nova/virt/libvirt/imagebackend.py
View File

@ -66,7 +66,6 @@ __imagebackend_opts = [
default='', # default determined by librados
help='Path to the ceph configuration file to use'),
cfg.StrOpt('hw_disk_discard',
default=None,
help='Discard option for nova managed disks (valid options '
'are: ignore, unmap). Need Libvirt(1.0.6) Qemu1.5 '
'(raw format) Qemu1.6(qcow2 format)'),

2
nova/volume/cinder.py
View File

@ -61,7 +61,7 @@ cinder_opts = [
help='Number of cinderclient retries on failed http calls',
deprecated_group='DEFAULT',
deprecated_name='cinder_http_retries'),
cfg.IntOpt('http_timeout', default=None,
cfg.IntOpt('http_timeout',
help='HTTP inactivity timeout (in seconds)',
deprecated_group='DEFAULT',
deprecated_name='cinder_http_timeout'),