Merge "Ensure rbd connect exception is properly caught"

2014-07-02 14:51:27 +00:00
parent 5867c06b01 02e4afbd81
commit 80897a3402
3 changed files with 33 additions and 4 deletions
--- a/etc/cinder/cinder.conf.sample
+++ b/etc/cinder/cinder.conf.sample
@@ -1583,6 +1583,11 @@
 # megabytes). (integer value)
 #rbd_store_chunk_size=4

+# Timeout value (in seconds) used when connecting to ceph
+# cluster. If value < 0, no timeout is set and default
+# librados value is used. (integer value)
+#rados_connect_timeout=-1
+

 #
 # Options defined in cinder.volume.drivers.san.hp.hp_3par_common