Merge "ceph: Allow to configure timeout" into stable/3.0
This commit is contained in:
commit
3a0e5a3662
|
@ -50,6 +50,7 @@ OPTS = [
|
|||
help='Ceph username (ie: admin without "client." prefix).'),
|
||||
cfg.StrOpt('ceph_secret', help='Ceph key', secret=True),
|
||||
cfg.StrOpt('ceph_keyring', help='Ceph keyring path.'),
|
||||
cfg.IntOpt('ceph_timeout', help='Ceph connection timeout'),
|
||||
cfg.StrOpt('ceph_conffile',
|
||||
default='/etc/ceph/ceph.conf',
|
||||
help='Ceph configuration file.'),
|
||||
|
@ -68,6 +69,10 @@ class CephStorage(_carbonara.CarbonaraBasedStorage):
|
|||
options['keyring'] = conf.ceph_keyring
|
||||
if conf.ceph_secret:
|
||||
options['key'] = conf.ceph_secret
|
||||
if conf.ceph_timeout:
|
||||
options['rados_osd_op_timeout'] = conf.ceph_timeout
|
||||
options['rados_mon_op_timeout'] = conf.ceph_timeout
|
||||
options['client_mount_timeout'] = conf.ceph_timeout
|
||||
|
||||
if not rados:
|
||||
raise ImportError("No module named 'rados' nor 'cradox'")
|
||||
|
|
Loading…
Reference in New Issue