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

2013-10-31 19:02:21 +00:00
parent bf4fcbb4f6 eb72451d62
commit eb2f8bd2cc
2 changed files with 2 additions and 2 deletions
--- a/tempest/cli/init.py
+++ b/tempest/cli/init.py
@@ -33,7 +33,7 @@ cli_opts = [
                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,
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -324,7 +324,7 @@ VolumeGroup = [
               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='',