Merge "fix duplicate api_extensions"
This commit is contained in:
commit
78da3db8ae
@ -320,6 +320,10 @@
|
|||||||
# If false, skip disk config tests (boolean value)
|
# If false, skip disk config tests (boolean value)
|
||||||
#disk_config=true
|
#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
|
# A list of enabled v3 extensions with a special entry all
|
||||||
# which indicates every extension is enabled (list value)
|
# which indicates every extension is enabled (list value)
|
||||||
#api_v3_extensions=all
|
#api_v3_extensions=all
|
||||||
@ -582,16 +586,8 @@
|
|||||||
# Options defined in tempest.config
|
# Options defined in tempest.config
|
||||||
#
|
#
|
||||||
|
|
||||||
# A list of enabled extensions with a special entry all which
|
# A list of enabled network extensions with a special entry
|
||||||
# indicates every extension is enabled (list value)
|
# 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)
|
|
||||||
#api_extensions=all
|
#api_extensions=all
|
||||||
|
|
||||||
|
|
||||||
@ -877,6 +873,10 @@
|
|||||||
# Runs Cinder volumes backup test (boolean value)
|
# Runs Cinder volumes backup test (boolean value)
|
||||||
#backup=true
|
#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)
|
# Is the v1 volume API enabled (boolean value)
|
||||||
#api_v1=true
|
#api_v1=true
|
||||||
|
|
||||||
|
@ -235,8 +235,8 @@ ComputeFeaturesGroup = [
|
|||||||
help="If false, skip disk config tests"),
|
help="If false, skip disk config tests"),
|
||||||
cfg.ListOpt('api_extensions',
|
cfg.ListOpt('api_extensions',
|
||||||
default=['all'],
|
default=['all'],
|
||||||
help='A list of enabled extensions with a special entry all '
|
help='A list of enabled compute extensions with a special '
|
||||||
'which indicates every extension is enabled'),
|
'entry all which indicates every extension is enabled'),
|
||||||
cfg.ListOpt('api_v3_extensions',
|
cfg.ListOpt('api_v3_extensions',
|
||||||
default=['all'],
|
default=['all'],
|
||||||
help='A list of enabled v3 extensions with a special entry 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 = [
|
NetworkFeaturesGroup = [
|
||||||
cfg.ListOpt('api_extensions',
|
cfg.ListOpt('api_extensions',
|
||||||
default=['all'],
|
default=['all'],
|
||||||
help='A list of enabled extensions with a special entry all '
|
help='A list of enabled network extensions with a special '
|
||||||
'which indicates every extension is enabled'),
|
'entry all which indicates every extension is enabled'),
|
||||||
]
|
]
|
||||||
|
|
||||||
volume_group = cfg.OptGroup(name='volume',
|
volume_group = cfg.OptGroup(name='volume',
|
||||||
@ -430,8 +430,8 @@ VolumeFeaturesGroup = [
|
|||||||
help='Runs Cinder volumes backup test'),
|
help='Runs Cinder volumes backup test'),
|
||||||
cfg.ListOpt('api_extensions',
|
cfg.ListOpt('api_extensions',
|
||||||
default=['all'],
|
default=['all'],
|
||||||
help='A list of enabled extensions with a special entry all '
|
help='A list of enabled volume extensions with a special '
|
||||||
'which indicates every extension is enabled'),
|
'entry all which indicates every extension is enabled'),
|
||||||
cfg.BoolOpt('api_v1',
|
cfg.BoolOpt('api_v1',
|
||||||
default=True,
|
default=True,
|
||||||
help="Is the v1 volume API enabled"),
|
help="Is the v1 volume API enabled"),
|
||||||
|
Loading…
Reference in New Issue
Block a user