commit eb2f8bd2cc75080eb3f9cf5b048d34b13a78bd84
author Jenkins <jenkins@review.openstack.org> Thu Oct 31 19:02:21 2013 +0000
committer Gerrit Code Review <review@openstack.org> Thu Oct 31 19:02:21 2013 +0000
tree f902decc0769f1a23eb1d8417624c5e4d0ec1fc0
parent bf4fcbb4f6aaf8c639c93e2267e80e13f3e57402
parent eb72451d62c17532982f75cb76f09feb8ce4f471

Merge "Fix default values so they work in a devstack run"

tempest/cli/__init__.py

diff --git a/tempest/cli/__init__.py b/tempest/cli/__init__.py
index a4c8316..bd1b44f 100644
--- a/tempest/cli/__init__.py
+++ b/tempest/cli/__init__.py
@@ -33,7 +33,7 @@
                 default=True,
                 help="enable cli tests"),
     cfg.StrOpt('cli_dir',
-               default='/usr/local/bin/',
+               default='/usr/local/bin',
                help="directory where python client binaries are located"),
     cfg.IntOpt('timeout',
                default=15,

tempest/config.py

diff --git a/tempest/config.py b/tempest/config.py
index 77dc008..925c4bd 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -324,7 +324,7 @@
                help='Timeout in seconds to wait for a volume to become'
                     'available.'),
     cfg.StrOpt('catalog_type',
-               default='Volume',
+               default='volume',
                help="Catalog type of the Volume Service"),
     cfg.StrOpt('region',
                default='',