Merge "Test user visible extra spec"
diff --git a/.zuul.yaml b/.zuul.yaml
index 85091d8..5d0c956 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -128,6 +128,8 @@
volume_revert: True
devstack_services:
barbican: true
+ # explicitly enable c-bak, as it may be disabled in the parent job
+ c-bak: true
tempest_plugins:
- cinder-tempest-plugin
irrelevant-files:
diff --git a/cinder_tempest_plugin/api/volume/base.py b/cinder_tempest_plugin/api/volume/base.py
index 1c64973..e049ff3 100644
--- a/cinder_tempest_plugin/api/volume/base.py
+++ b/cinder_tempest_plugin/api/volume/base.py
@@ -91,6 +91,10 @@
name = data_utils.rand_name(cls.__name__ + '-Volume')
kwargs['name'] = name
+ if CONF.compute.compute_volume_common_az:
+ kwargs.setdefault('availability_zone',
+ CONF.compute.compute_volume_common_az)
+
volume = cls.volumes_client.create_volume(**kwargs)['volume']
cls.addClassResourceCleanup(
cls.volumes_client.wait_for_resource_deletion, volume['id'])