diff --git a/gnocchi/storage/ceph.py b/gnocchi/storage/ceph.py
index 628ee019c..d1d3a200d 100644
--- a/gnocchi/storage/ceph.py
+++ b/gnocchi/storage/ceph.py
@@ -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'")