From: Alfredo Deza <alfredo.deza@inktank.com>
Date: Mon, 16 Sep 2013 16:33:21 +0000 (-0400)
Subject: introduce a timeout of 7s for all mon init commands
X-Git-Tag: v1.2.4~6^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8490f622834f05c0d86d47722d9044621eaa419b;p=ceph-deploy.git

introduce a timeout of 7s for all mon init commands

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
---

diff --git a/ceph_deploy/hosts/centos/mon/create.py b/ceph_deploy/hosts/centos/mon/create.py
index a0b7bdb..04d8e0d 100644
--- a/ceph_deploy/hosts/centos/mon/create.py
+++ b/ceph_deploy/hosts/centos/mon/create.py
@@ -19,4 +19,5 @@ def create(distro, logger, args, monitor_keyring):
             'mon.{hostname}'.format(hostname=hostname)
         ],
         exit=True,
+        timeout=7,
     )
diff --git a/ceph_deploy/hosts/debian/mon/create.py b/ceph_deploy/hosts/debian/mon/create.py
index 40f6e8d..c888dc0 100644
--- a/ceph_deploy/hosts/debian/mon/create.py
+++ b/ceph_deploy/hosts/debian/mon/create.py
@@ -21,6 +21,7 @@ def create(distro, logger, args, monitor_keyring):
                 'id={hostname}'.format(hostname=hostname),
             ],
             exit=True,
+            timeout=7,
         )
 
     elif distro.init == 'sysvinit':  # Debian uses sysvinit
@@ -35,6 +36,7 @@ def create(distro, logger, args, monitor_keyring):
                 'mon.{hostname}'.format(hostname=hostname)
             ],
             exit=True,
+            timeout=7,
         )
     else:
         raise RuntimeError('create cannot use init %s' % distro.init)
diff --git a/ceph_deploy/hosts/fedora/mon/create.py b/ceph_deploy/hosts/fedora/mon/create.py
index e8fa199..2dad28c 100644
--- a/ceph_deploy/hosts/fedora/mon/create.py
+++ b/ceph_deploy/hosts/fedora/mon/create.py
@@ -20,4 +20,5 @@ def create(distro, logger, args, monitor_keyring):
             'mon.{hostname}'.format(hostname=hostname)
         ],
         exit=True,
+        timeout=7,
     )
diff --git a/ceph_deploy/hosts/suse/mon/create.py b/ceph_deploy/hosts/suse/mon/create.py
index e8fa199..2dad28c 100644
--- a/ceph_deploy/hosts/suse/mon/create.py
+++ b/ceph_deploy/hosts/suse/mon/create.py
@@ -20,4 +20,5 @@ def create(distro, logger, args, monitor_keyring):
             'mon.{hostname}'.format(hostname=hostname)
         ],
         exit=True,
+        timeout=7,
     )