diff --git a/0001-downgrade-the-version-of-qemu-from-4.2.0-to-4.1.0.patch b/0001-downgrade-the-version-of-qemu-from-4.2.0-to-4.1.0.patch deleted file mode 100644 index 62e4decfe7d848d5b284bd42dde79248b369e3b1..0000000000000000000000000000000000000000 --- a/0001-downgrade-the-version-of-qemu-from-4.2.0-to-4.1.0.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 61fdc7d0caa978864e196a48d06ff262f7c78dc9 Mon Sep 17 00:00:00 2001 -From: FFrog -Date: Thu, 9 Sep 2021 19:35:41 +0800 -Subject: [PATCH] downgrade the version of qemu from 4.2.0 to 4.1.0 - ---- - nova/virt/libvirt/driver.py | 24 ++++++++++++++++++++++-- - 1 file changed, 22 insertions(+), 2 deletions(-) - -diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py -index 8ee8757..e447b85 100644 ---- a/nova/virt/libvirt/driver.py -+++ b/nova/virt/libvirt/driver.py -@@ -213,7 +213,7 @@ patch_tpool_proxy() - # - # DO NOT FORGET to update this document when touching any versions below! - MIN_LIBVIRT_VERSION = (6, 0, 0) --MIN_QEMU_VERSION = (4, 2, 0) -+MIN_QEMU_VERSION = (4, 1, 0) - NEXT_MIN_LIBVIRT_VERSION = (7, 0, 0) - NEXT_MIN_QEMU_VERSION = (5, 2, 0) - -@@ -234,6 +234,10 @@ VGPU_RESOURCE_SEMAPHORE = 'vgpu_resources' - - LIBVIRT_PERF_EVENT_PREFIX = 'VIR_PERF_PARAM_' - -+# -blockdev support (replacing -drive) -+MIN_LIBVIRT_BLOCKDEV = (6, 0, 0) -+MIN_QEMU_BLOCKDEV = (4, 2, 0) -+ - # VDPA interface support - MIN_LIBVIRT_VDPA = (6, 9, 0) - MIN_QEMU_VDPA = (5, 1, 0) -@@ -2092,7 +2096,23 @@ class LibvirtDriver(driver.ComputeDriver): - guest.delete_configuration(support_uefi) - - try: -- dev.copy(conf.to_xml(), reuse_ext=True) -+ # NOTE(lyarwood): Use virDomainBlockCopy from libvirt >= 6.0.0 -+ # and QEMU >= 4.2.0 with -blockdev domains allowing QEMU to -+ # copy to remote disks. -+ if self._host.has_min_version(lv_ver=MIN_LIBVIRT_BLOCKDEV, -+ hv_ver=MIN_QEMU_BLOCKDEV): -+ dev.copy(conf.to_xml(), reuse_ext=True) -+ else: -+ # TODO(lyarwood): Remove the following use of -+ # virDomainBlockRebase once MIN_LIBVIRT_VERSION hits >= -+ # 6.0.0 and MIN_QEMU_VERSION hits >= 4.2.0. -+ # Start copy with VIR_DOMAIN_BLOCK_REBASE_REUSE_EXT flag to -+ # allow writing to existing external volume file. Use -+ # VIR_DOMAIN_BLOCK_REBASE_COPY_DEV if it's a block device -+ # to make sure XML is generated correctly (bug 1691195) -+ copy_dev = conf.source_type == 'block' -+ dev.rebase(conf.source_path, copy=True, reuse_ext=True, -+ copy_dev=copy_dev) - - while not dev.is_job_complete(): - time.sleep(0.5) --- -2.27.0 - diff --git a/nova-23.0.1.tar.gz b/nova-25.0.0.tar.gz similarity index 53% rename from nova-23.0.1.tar.gz rename to nova-25.0.0.tar.gz index 1b1df218d93e76142c2a92585e3c8f59f3f912d6..862c44dff00491b1078debb1590d8310ef69fbed 100644 Binary files a/nova-23.0.1.tar.gz and b/nova-25.0.0.tar.gz differ diff --git a/openstack-nova.spec b/openstack-nova.spec index f9227475f7d84da5aa198e8ff020104c47749d76..72ca698e420c9a8b945a6d3c2b6f57caa66c109f 100644 --- a/openstack-nova.spec +++ b/openstack-nova.spec @@ -16,17 +16,14 @@ standard hardware configurations and seven major hypervisors. Name: openstack-nova # Liberty semver reset # https://review.openstack.org/#/q/I6a35fa0dda798fad93b804d00a46af80f08d475c,n,z -Version: 23.0.1 -Release: 5 +Version: 25.0.0 +Release: 1 Summary: OpenStack Compute (nova) License: ASL 2.0 URL: http://openstack.org/projects/compute/ Source0: https://tarballs.openstack.org/nova/nova-%{upstream_version}.tar.gz -Patch0: 0001-downgrade-the-version-of-qemu-from-4.2.0-to-4.1.0.patch - - Source1: nova-dist.conf Source6: nova.logrotate @@ -729,6 +726,9 @@ exit 0 %endif %changelog +* Mon Jul 18 2022 OpenStack_SIG - 25.0.0-1 +- Upgrade package to version 25.0.0 + * Thu Sep 09 2021 ffrog - 23.0.1-5 - Fix the bugs about downgrading the version requirement of qemu from 4.2.0 to 4.1.0