]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
src.ceph-create-keys: Add connection timeouts. 11995/head
authorOwen Synge <osynge@suse.com>
Tue, 15 Nov 2016 14:59:05 +0000 (15:59 +0100)
committerOwen Synge <osynge@suse.com>
Thu, 17 Nov 2016 09:28:21 +0000 (10:28 +0100)
ceph commands will hang indefinitely if called without a parameter:

    --connect-timeout

Signed-off-by: Owen Synge <osynge@suse.com>
src/ceph-create-keys

index d1dce4209b46156b391b202ff5b4843caa45f4bd..c7846f85d504bd44b117d40c92d92191f10f8789 100755 (executable)
@@ -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',