openstack
/
tempest
Code Issues Proposed changes

Merge "fix duplicate api_extensions"

This commit is contained in:
Jenkins 2014-02-25 08:25:51 +00:00 committed by Gerrit Code Review
parent fe6da2177d de25c02290
commit 78da3db8ae
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
etc/tempest.conf.sample
View File

@ -320,6 +320,10 @@
# If false, skip disk config tests (boolean value)
#disk_config=true
# A list of enabled compute extensions with a special entry
# all which indicates every extension is enabled (list value)
#api_extensions=all
# A list of enabled v3 extensions with a special entry all
# which indicates every extension is enabled (list value)
#api_v3_extensions=all
@ -582,16 +586,8 @@
# Options defined in tempest.config
#
# A list of enabled extensions with a special entry all which
# indicates every extension is enabled (list value)
#api_extensions=all
# A list of enabled extensions with a special entry all which
# indicates every extension is enabled (list value)
#api_extensions=all
# A list of enabled extensions with a special entry all which
# indicates every extension is enabled (list value)
# A list of enabled network extensions with a special entry
# all which indicates every extension is enabled (list value)
#api_extensions=all
@ -877,6 +873,10 @@
# Runs Cinder volumes backup test (boolean value)
#backup=true
# A list of enabled volume extensions with a special entry all
# which indicates every extension is enabled (list value)
#api_extensions=all
# Is the v1 volume API enabled (boolean value)
#api_v1=true

12
tempest/config.py
View File

@ -235,8 +235,8 @@ ComputeFeaturesGroup = [
help="If false, skip disk config tests"),
cfg.ListOpt('api_extensions',
default=['all'],
help='A list of enabled extensions with a special entry all '
'which indicates every extension is enabled'),
help='A list of enabled compute extensions with a special '
'entry all which indicates every extension is enabled'),
cfg.ListOpt('api_v3_extensions',
default=['all'],
help='A list of enabled v3 extensions with a special entry all'
@ -372,8 +372,8 @@ network_feature_group = cfg.OptGroup(name='network-feature-enabled',
NetworkFeaturesGroup = [
cfg.ListOpt('api_extensions',
default=['all'],
help='A list of enabled extensions with a special entry all '
'which indicates every extension is enabled'),
help='A list of enabled network extensions with a special '
'entry all which indicates every extension is enabled'),
]
volume_group = cfg.OptGroup(name='volume',
@ -430,8 +430,8 @@ VolumeFeaturesGroup = [
help='Runs Cinder volumes backup test'),
cfg.ListOpt('api_extensions',
default=['all'],
help='A list of enabled extensions with a special entry all '
'which indicates every extension is enabled'),
help='A list of enabled volume extensions with a special '
'entry all which indicates every extension is enabled'),
cfg.BoolOpt('api_v1',
default=True,
help="Is the v1 volume API enabled"),