openstack
/
gnocchi
Code Issues Proposed changes

Merge "ceph: Allow to configure timeout" into stable/3.0

This commit is contained in:
Jenkins 2017-04-05 02:26:10 +00:00 committed by Gerrit Code Review
parent ad739d4795 b236ba17cf
commit 3a0e5a3662
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gnocchi/storage/ceph.py
View File

@ -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'")