commit 7374093fa81bdaf71321f11af3539e831281f018
author Jenkins <jenkins@review.openstack.org> Fri Dec 20 00:49:22 2013 +0000
committer Gerrit Code Review <review@openstack.org> Fri Dec 20 00:49:22 2013 +0000
tree 6ee7282c0717456795e102166738b2a18d9d9358
parent 0d23327371a333feed826450070731ca34a4708b
parent 85cd514b709e87dcbfdf4151bd54a35d3dcf15b5

Merge "Fix the help message for run_ssh"

etc/tempest.conf.sample

diff --git a/etc/tempest.conf.sample b/etc/tempest.conf.sample
index 1080ddf..02ad1d5 100644
--- a/etc/tempest.conf.sample
+++ b/etc/tempest.conf.sample
@@ -256,7 +256,7 @@
 # (integer value)
 #build_timeout=300
 
-# Does the test environment support snapshots? (boolean value)
+# Should the tests ssh to instances? (boolean value)
 #run_ssh=false
 
 # User name used to authenticate to an instance. (string

tempest/config.py

diff --git a/tempest/config.py b/tempest/config.py
index 3d9eba9..60a6d4f 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -137,7 +137,7 @@
                help="Timeout in seconds to wait for an instance to build."),
     cfg.BoolOpt('run_ssh',
                 default=False,
-                help="Does the test environment support snapshots?"),
+                help="Should the tests ssh to instances?"),
     cfg.StrOpt('ssh_user',
                default='root',
                help="User name used to authenticate to an instance."),