From 29a4b1996129c97b096637969dc3d1308399fda4 Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Date: Mon, 27 Mar 2017 14:20:07 +0800
Subject: [PATCH] Enable timeout feature when connecting ceph in cinder

cinder-volume will be hanged if rados_connect_timeout is disabled. And
no error message will be thrown. Disable timeout is not a good idea.

This patch sets the rados_connect_timeout to 5.

Change-Id: I05e7343d09d75399a7031013b4329a2cb81792fb
Closes-Bug: #1676267
---
 ansible/roles/cinder/templates/cinder.conf.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/roles/cinder/templates/cinder.conf.j2 b/ansible/roles/cinder/templates/cinder.conf.j2
index 2d7e192fdc..224677fd5c 100644
--- a/ansible/roles/cinder/templates/cinder.conf.j2
+++ b/ansible/roles/cinder/templates/cinder.conf.j2
@@ -108,7 +108,7 @@ rbd_ceph_conf = /etc/ceph/ceph.conf
 rbd_flatten_volume_from_snapshot = false
 rbd_max_clone_depth = 5
 rbd_store_chunk_size = 4
-rados_connect_timeout = -1
+rados_connect_timeout = 5
 rbd_user = cinder
 rbd_secret_uuid = {{ cinder_rbd_secret_uuid }}
 report_discard_supported = True