From: Owen Synge <osynge@suse.com>
Date: Tue, 15 Nov 2016 14:59:05 +0000 (+0100)
Subject: src.ceph-create-keys: Add connection timeouts.
X-Git-Tag: v12.0.1~221^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0c7af43a44184b211c2ee13ab0cf8e68a48d7495;p=ceph.git

src.ceph-create-keys: Add connection timeouts.

ceph commands will hang indefinitely if called without a parameter:

    --connect-timeout

Signed-off-by: Owen Synge <osynge@suse.com>
---

diff --git a/src/ceph-create-keys b/src/ceph-create-keys
index d1dce4209b46..c7846f85d504 100755
--- a/src/ceph-create-keys
+++ b/src/ceph-create-keys
@@ -103,6 +103,7 @@ def get_key(cluster, mon_id):
 
                 args_prefix = [
                         "ceph",
+                        '--connect-timeout=20',
                         '--cluster={cluster}'.format(cluster=cluster),
                         '--name=mon.',
                         '--keyring=/var/lib/ceph/mon/{cluster}-{mon_id}/keyring'.format(
@@ -175,6 +176,7 @@ def bootstrap_key(cluster, type_):
 
     args = [
         'ceph',
+        '--connect-timeout=20',
         '--cluster={cluster}'.format(cluster=cluster),
         'auth',
         'get-or-create',