Skip to content

Commit 9c96eda

Browse files
authored
Merge pull request #82 from stackhpc/upstream/2023.1-2024-07-08
Synchronise 2023.1 with upstream
2 parents 5516304 + f732f84 commit 9c96eda

File tree

10 files changed

+1363
-18
lines changed

10 files changed

+1363
-18
lines changed

.zuul.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -624,6 +624,8 @@
624624
manage_locations: true
625625
volume:
626626
volume_size: 1
627+
image:
628+
disk_formats: qcow2,ari,aki,vhd,vmdk,raw,ami,vdi,iso,vhdx
627629
post-config:
628630
$NOVA_CONF:
629631
libvirt:

nova/conf/workarounds.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,16 @@
460460
Howerver, if you don't use automatic cleaning, it can cause an
461461
extra delay before and Ironic node is available for building a
462462
new Nova instance.
463+
"""),
464+
cfg.BoolOpt(
465+
'disable_deep_image_inspection',
466+
default=False,
467+
help="""
468+
This disables the additional deep image inspection that the compute node does
469+
when downloading from glance. This includes backing-file, data-file, and
470+
known-features detection *before* passing the image to qemu-img. Generally,
471+
this inspection should be enabled for maximum safety, but this workaround
472+
option allows disabling it if there is a compatibility concern.
463473
"""),
464474
]
465475

0 commit comments

Comments
 (0)