Merge "Add multistore image option"

Zuul 2022-03-14 17:26:05 +00:00 committed by Gerrit Code Review
commit 9586241409
1 changed files with 13 additions and 0 deletions

View File

@ -56,6 +56,9 @@ class ImageService(VersionedService):
self.convert = convert
def set_default_tempest_options(self, conf):
# set 'image-feature-enabled' only if multiple stores available
if self._is_multistore_enabled():
conf.set('image-feature-enabled', 'import_image', 'True')
# When cirros is the image, set validation.image_ssh_user to cirros.
# The option is heavily used in CI and it's also usefull for refstack,
# because we don't have to specify overrides.
@ -77,6 +80,16 @@ class ImageService(VersionedService):
# default value
conf.set('image', 'http_image', C.DEFAULT_IMAGE)
def _is_multistore_enabled(self):
except Exception:'Can not retrieve stores, either multiple stores are '
'not configured or user are not allowed access '
'to the stores information')
return False
return True
def get_supported_versions(self):
return ['v1', 'v2']