From eb72451d62c17532982f75cb76f09feb8ce4f471 Mon Sep 17 00:00:00 2001 From: Matthew Treinish Date: Fri, 25 Oct 2013 15:12:59 +0000 Subject: [PATCH] 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 | 2 +- tempest/config.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tempest/cli/__init__.py b/tempest/cli/__init__.py index b082b1ee1a..c8f9493619 100644 --- 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, diff --git a/tempest/config.py b/tempest/config.py index 7af89d7c23..734ae0a0bf 100644 --- 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='',