commit eb72451d62c17532982f75cb76f09feb8ce4f471
author Matthew Treinish <treinish@linux.vnet.ibm.com> Fri Oct 25 15:12:59 2013 +0000
committer Matthew Treinish <treinish@linux.vnet.ibm.com> Tue Oct 29 20:10:53 2013 +0000
tree ccf189b1bc3c8892bc564c3f6170be1b4f3da3ca
parent f319a739e50bf95e95aeb18405720fd89f71b62f

Fix default values so they work in a devstack run

This commit fixes errors with the default values used in config.py
Previously, an incorrect default could potentially be masked in a
gate run by putting the correct value in the sample config. However,
by moving to an auto-generated sample config file the defaults set
in config.py will be used, exposing these mismatches.

Partially Implements: blueprint config-cleanup

Change-Id: I55caeed2589d45337337b291d7131afdadf28bb8

tempest/cli/__init__.py

diff --git a/tempest/cli/__init__.py b/tempest/cli/__init__.py
index b082b1e..c8f9493 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 7af89d7..734ae0a 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='',