Merge "Populate image.http_qcow2_image"

This commit is contained in:
Zuul 2024-07-22 16:37:40 +00:00 committed by Gerrit Code Review
commit 6cea11efd9
2 changed files with 4 additions and 0 deletions

View File

@ -26,6 +26,9 @@ DEPLOYER_INPUT = os.path.join(os.path.expanduser("~"),
DEFAULT_IMAGE_DIR = 'etc' DEFAULT_IMAGE_DIR = 'etc'
DEFAULT_IMAGE = ("https://download.cirros-cloud.net/0.6.2/" DEFAULT_IMAGE = ("https://download.cirros-cloud.net/0.6.2/"
"cirros-0.6.2-x86_64-disk.img") "cirros-0.6.2-x86_64-disk.img")
# Should DEFAULT_IMAGE be changed to a format which is not qcow2,
# then disconnect DEFAULT_IMAGE from DEFAULT_QCOW2_IMAGE
DEFAULT_QCOW2_IMAGE = DEFAULT_IMAGE
DEFAULT_IMAGES = [("https://download.cirros-cloud.net/0.6.2/" DEFAULT_IMAGES = [("https://download.cirros-cloud.net/0.6.2/"
"cirros-0.6.2-x86_64-disk.img"), "cirros-0.6.2-x86_64-disk.img"),

View File

@ -79,6 +79,7 @@ class ImageService(VersionedService):
# this value can't be set to image.http_image, therefor set the # this value can't be set to image.http_image, therefor set the
# default value # default value
conf.set('image', 'http_image', C.DEFAULT_IMAGE) conf.set('image', 'http_image', C.DEFAULT_IMAGE)
conf.set('image', 'http_qcow2_image', C.DEFAULT_QCOW2_IMAGE)
def _is_multistore_enabled(self): def _is_multistore_enabled(self):
try: try: