Merge "Use volume_type option in tempest.conf in compute api test"
This commit is contained in:
commit
98405eb0a6
@ -515,6 +515,12 @@ class BaseV2ComputeTest(api_version_utils.BaseMicroversionTest,
|
||||
kwargs['display_name'] = vol_name
|
||||
if image_ref is not None:
|
||||
kwargs['imageRef'] = image_ref
|
||||
if CONF.volume.volume_type and 'volume_type' not in kwargs:
|
||||
# If volume_type is not provided in config then no need to
|
||||
# add a volume type and
|
||||
# if volume_type has already been added by child class then
|
||||
# no need to override.
|
||||
kwargs['volume_type'] = CONF.volume.volume_type
|
||||
if CONF.compute.compute_volume_common_az:
|
||||
kwargs.setdefault('availability_zone',
|
||||
CONF.compute.compute_volume_common_az)
|
||||
|
Loading…
Reference in New Issue
Block a user