Bump 2024.2 images
Skip-Release-Notes
Change-Id: Id4abc6e2ca6f5a5f63045b560156bf63035394d4
diff --git a/images/nova/Dockerfile b/images/nova/Dockerfile
index 30517aa..497d9f2 100644
--- a/images/nova/Dockerfile
+++ b/images/nova/Dockerfile
@@ -3,11 +3,9 @@
# Atmosphere-Rebuild-Time: 2024-12-17T01:27:44Z
FROM openstack-venv-builder AS build
-ARG NOVA_GIT_REF=c199becf52267ba37c5191f6f82e29bb5232b607
+ARG NOVA_GIT_REF=1b28f649feaf2c9929f15214814f8af950e5c19c
ADD --keep-git-dir=true https://opendev.org/openstack/nova.git#${NOVA_GIT_REF} /src/nova
RUN git -C /src/nova fetch --unshallow
-COPY patches/nova /patches/nova
-RUN git -C /src/nova apply --verbose /patches/nova/*
ARG SCHEDULER_FILTERS_GIT_REF=77ed1c2ca70f4166a6d0995c7d3d90822f0ca6c0
ADD --keep-git-dir=true https://github.com/vexxhost/nova-scheduler-filters.git#${SCHEDULER_FILTERS_GIT_REF} /src/nova-scheduler-filters
RUN git -C /src/nova-scheduler-filters fetch --unshallow
diff --git a/images/nova/patches/nova/0000-Fix-port-group-network-metadata-generation.patch b/images/nova/patches/nova/0000-Fix-port-group-network-metadata-generation.patch
deleted file mode 100644
index 98be564..0000000
--- a/images/nova/patches/nova/0000-Fix-port-group-network-metadata-generation.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 8558f59630f81beba2789e6deef2cb5e6b367f20 Mon Sep 17 00:00:00 2001
-From: Mohammed Naser <mnaser@vexxhost.com>
-Date: Thu, 04 Jul 2024 14:09:23 -0400
-Subject: [PATCH] Fix port group network metadata generation
-
-When switching to using OpenStack SDK, there was a change missed
-that didn't account for the SDK returning generators instead of
-a list, so the loop on ports and port groups made it so that it
-started returning an empty list afterwards.
-
-Since there is no a masse of ports for a baremetal system usually,
-we take the generator into a list right away to prevent this.
-
-Closes-Bug: #2071972
-Change-Id: I90766f8c225d834bb2eec606754107ea6a212f6d
----
-
-diff --git a/nova/tests/unit/virt/ironic/test_driver.py b/nova/tests/unit/virt/ironic/test_driver.py
-index 736eac2..bf32918 100644
---- a/nova/tests/unit/virt/ironic/test_driver.py
-+++ b/nova/tests/unit/virt/ironic/test_driver.py
-@@ -2785,8 +2785,8 @@
- node_id=self.node.id,
- address='00:00:00:00:00:02',
- port_group_id=portgroup.id)
-- self.mock_conn.ports.return_value = [port1, port2]
-- self.mock_conn.port_groups.return_value = [portgroup]
-+ self.mock_conn.ports.return_value = iter([port1, port2])
-+ self.mock_conn.port_groups.return_value = iter([portgroup])
-
- metadata = self.driver._get_network_metadata(self.node,
- self.network_info)
-diff --git a/nova/virt/ironic/driver.py b/nova/virt/ironic/driver.py
-index 3af85d3..c990218 100644
---- a/nova/virt/ironic/driver.py
-+++ b/nova/virt/ironic/driver.py
-@@ -1050,10 +1050,10 @@
- :param network_info: Instance network information.
- """
- base_metadata = netutils.get_network_metadata(network_info)
-- ports = self.ironic_connection.ports(node=node.id, details=True)
-- port_groups = self.ironic_connection.port_groups(
-+ ports = list(self.ironic_connection.ports(node=node.id, details=True))
-+ port_groups = list(self.ironic_connection.port_groups(
- node=node.id, details=True,
-- )
-+ ))
- vif_id_to_objects = {'ports': {}, 'portgroups': {}}
- for collection, name in ((ports, 'ports'),
- (port_groups, 'portgroups')):