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 a0b7bdb4fbd2c4b090cc1e4410336fd63f1428b1..04d8e0d00c2995a9e64107af4fc64f05a72b4cbd 100644 (file)
--- 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 40f6e8dc16a9a9a0c1e8c703dccbf25bb3a97f75..c888dc0ff1a6d8367084b580deab97313c2a3e45 100644 (file)
--- 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 e8fa199b3d7d3e4066da313d55de4a19f17ecc17..2dad28c90ef0a6a121e4db04f30e16b2b1575341 100644 (file)
--- 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 e8fa199b3d7d3e4066da313d55de4a19f17ecc17..2dad28c90ef0a6a121e4db04f30e16b2b1575341 100644 (file)
--- 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,
     )