Synchronise zed with upstream

.zuul.yaml

@@ -339,6 +339,8 @@
     post-run: playbooks/nova-next/post.yaml
     required-projects:
         - novnc/novnc
+        - name: openstack/tempest
+          override-checkout: zed-last
     vars:
       # We use the "all" environment for tempest_test_regex and
       # tempest_exclude_regex.
@@ -352,7 +354,7 @@
       # tempest_test_exclude_list.
       # FIXME(lyarwood): The tempest.api.compute.admin.test_volume_swap tests
       # are skipped until bug #1929710 is resolved.
-      tempest_exclude_regex: ^tempest\.(scenario\.test_network_(?!qos)|api\.compute\.admin\.test_volume_swap)|tempest.api.compute.servers.test_device_tagging.TaggedAttachmentsTest.test_tagged_attachment
+      tempest_exclude_regex: ^tempest\.(scenario\.test_network_(?!qos)|api\.compute\.admin\.test_volume_swap)|tempest.api.compute.servers.test_device_tagging.TaggedAttachmentsTest.test_tagged_attachment|test_instances_with_cinder_volumes_on_all_compute_nodes
       devstack_local_conf:
         post-config:
           $NOVA_CPU_CONF:
@@ -596,23 +598,17 @@
     pre-run:
       - playbooks/ceph/glance-copy-policy.yaml
     vars:
-      # NOTE(elod.illes): this job started to break with the following five
-      # test cases, somewhere around merging cinder-tempest-plugin patch
-      # I281f881ad565e565839522ddf02057f7545c7146 so let's just exclude
-      # them to unblock the gate.
-      tempest_exclude_regex: "\
-          (test_delete_dep_chain)|\
-          (test_delete_dep_chain_2)|\
-          (test_delete_source_snapshot)|\
-          (test_delete_source_volume)|\
-          (test_nova_image_snapshot_dependency)"
+      # NOTE(elod.illes): this job is breaking with the following test case on
+      # unmaintained/yoga, so let's just exclude it to unblock the gate
+      tempest_exclude_regex: test_nova_image_snapshot_dependency
       # NOTE(danms): These tests create an empty non-raw image, which nova
       # will refuse because we set never_download_image_if_on_rbd in this job.
       # Just skip these tests for this case.
       devstack_localrc:
         GLANCE_STANDALONE: True
         GLANCE_USE_IMPORT_WORKFLOW: True
         DEVSTACK_PARALLEL: True
+        CEPH_MIN_CLIENT_VERSION: "mimic"
       # NOTE(danms): This job is pretty heavy as it is, so we disable some
       # services that are not relevant to the nova-glance-ceph scenario
       # that this job is intended to validate.

nova/conf/workarounds.py

@@ -438,6 +438,16 @@
 Howerver, if you don't use automatic cleaning, it can cause an
 extra delay before and Ironic node is available for building a
 new Nova instance.
+"""),
+    cfg.BoolOpt(
+        'disable_deep_image_inspection',
+        default=False,
+        help="""
+This disables the additional deep image inspection that the compute node does
+when downloading from glance. This includes backing-file, data-file, and
+known-features detection *before* passing the image to qemu-img. Generally,
+this inspection should be enabled for maximum safety, but this workaround
+option allows disabling it if there is a compatibility concern.
 """),
 ]