commit f2392ce42caf4405938a29c06af80cb984e7cd3a
author Jenkins <jenkins@review.openstack.org> Mon Jan 27 00:45:10 2014 +0000
committer Gerrit Code Review <review@openstack.org> Mon Jan 27 00:45:10 2014 +0000
tree ba43399fc0ac60221e1b5ce9c772fc7e4bd5e5e1
parent 6739704b11588279b1a2942181100d2fc732073e
parent 6b636677c2a97a363cc7f1517ad10b4b9fd20a5c

Merge "Increase ping timeout from 60 to 120 seconds"

etc/tempest.conf.sample

diff --git a/etc/tempest.conf.sample b/etc/tempest.conf.sample
index bb9a68e..21c8506 100644
--- a/etc/tempest.conf.sample
+++ b/etc/tempest.conf.sample
@@ -226,7 +226,7 @@
 
 # Timeout in seconds to wait for ping to succeed. (integer
 # value)
-#ping_timeout=60
+#ping_timeout=120
 
 # Timeout in seconds to wait for authentication to succeed.
 # (integer value)

tempest/config.py

diff --git a/tempest/config.py b/tempest/config.py
index d529965..5a9199d 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -147,7 +147,7 @@
                default='root',
                help="User name used to authenticate to an instance."),
     cfg.IntOpt('ping_timeout',
-               default=60,
+               default=120,
                help="Timeout in seconds to wait for ping to "
                     "succeed."),
     cfg.IntOpt('ssh_timeout',