diff --git a/images/cluster-api-provider-openstack/patches/0000-fix-skip-port-deletion-when-instances-have-no-port.patch b/images/cluster-api-provider-openstack/patches/0000-fix-skip-port-deletion-when-instances-have-no-port.patch index 617489883..6a1e047f8 100644 --- a/images/cluster-api-provider-openstack/patches/0000-fix-skip-port-deletion-when-instances-have-no-port.patch +++ b/images/cluster-api-provider-openstack/patches/0000-fix-skip-port-deletion-when-instances-have-no-port.patch @@ -14,7 +14,7 @@ index 4c213851f8..84b9bfc618 100644 @@ -315,6 +315,10 @@ func (s *Service) GarbageCollectErrorInstancesPort(eventObject runtime.Object, i return fmt.Errorf("garbage collection of port %s failed, found %d ports with the same name", portName, len(portList)) } - + + if len(portList) == 0 { + continue + } diff --git a/images/glance/patches/glance_store/0000-rbd-compute-appropriate-resize-amount-before-resizin.patch b/images/glance/patches/glance_store/0000-rbd-compute-appropriate-resize-amount-before-resizin.patch index d57f318a0..3f482cbeb 100644 --- a/images/glance/patches/glance_store/0000-rbd-compute-appropriate-resize-amount-before-resizin.patch +++ b/images/glance/patches/glance_store/0000-rbd-compute-appropriate-resize-amount-before-resizin.patch @@ -143,4 +143,3 @@ index 4f24c26..fb6522a 100644 class TestStore(base.StoreBaseTest, -- 2.34.1 - diff --git a/images/horizon/patches/horizon/0000-fix-ignore-errors-when-flavors-are-deleted.patch b/images/horizon/patches/horizon/0000-fix-ignore-errors-when-flavors-are-deleted.patch index 211d0552a..93fbfcdbf 100644 --- a/images/horizon/patches/horizon/0000-fix-ignore-errors-when-flavors-are-deleted.patch +++ b/images/horizon/patches/horizon/0000-fix-ignore-errors-when-flavors-are-deleted.patch @@ -106,4 +106,3 @@ index badf540b8..b848f6fff 100644 -- 2.34.1 - diff --git a/images/horizon/patches/horizon/0001-Fixing-Incorrect-URL-when-browsing-Swift-containers.patch b/images/horizon/patches/horizon/0001-Fixing-Incorrect-URL-when-browsing-Swift-containers.patch index 2e5b936ed..58eafd84c 100644 --- a/images/horizon/patches/horizon/0001-Fixing-Incorrect-URL-when-browsing-Swift-containers.patch +++ b/images/horizon/patches/horizon/0001-Fixing-Incorrect-URL-when-browsing-Swift-containers.patch @@ -37,4 +37,3 @@ index 55262a1fa..c14128cbf 100644 ctrl.currentURL = ctrl.containerURL; -- 2.34.1 - diff --git a/images/horizon/patches/magnum-ui/0000-fix-disable-resizing-for-admins.patch b/images/horizon/patches/magnum-ui/0000-fix-disable-resizing-for-admins.patch index a64b453f7..f5cfaf379 100644 --- a/images/horizon/patches/magnum-ui/0000-fix-disable-resizing-for-admins.patch +++ b/images/horizon/patches/magnum-ui/0000-fix-disable-resizing-for-admins.patch @@ -103,4 +103,3 @@ index 842df87..645b149 100644 it('should open the modal, hide the loading spinner and check the form model', -- 2.34.1 - diff --git a/images/keystone/patches/keystone/0000-Ensure-application-credentials-take-account-of-impli.patch b/images/keystone/patches/keystone/0000-Ensure-application-credentials-take-account-of-impli.patch index 83689fa23..2d0841e12 100644 --- a/images/keystone/patches/keystone/0000-Ensure-application-credentials-take-account-of-impli.patch +++ b/images/keystone/patches/keystone/0000-Ensure-application-credentials-take-account-of-impli.patch @@ -44,4 +44,3 @@ index 78146295d..b152d97c2 100644 -- 2.34.1 - diff --git a/images/manila/patches/manila/0000-fix-stop-using-batch_op-for-rename_table.patch b/images/manila/patches/manila/0000-fix-stop-using-batch_op-for-rename_table.patch index c904b265b..c1f2306ce 100644 --- a/images/manila/patches/manila/0000-fix-stop-using-batch_op-for-rename_table.patch +++ b/images/manila/patches/manila/0000-fix-stop-using-batch_op-for-rename_table.patch @@ -28,4 +28,3 @@ index 42d26b75e..373e308d0 100644 def downgrade_export_locations_table(connection): -- 2.34.1 - diff --git a/images/neutron/patches/neutron/0000-fix-netns-deletion-of-broken-namespaces.patch b/images/neutron/patches/neutron/0000-fix-netns-deletion-of-broken-namespaces.patch index a20200b77..efa479888 100644 --- a/images/neutron/patches/neutron/0000-fix-netns-deletion-of-broken-namespaces.patch +++ b/images/neutron/patches/neutron/0000-fix-netns-deletion-of-broken-namespaces.patch @@ -142,4 +142,3 @@ index 6df7da702d..9bf9f0db52 100644 networks containing vif ports of type ''(blank) and 'external'. -- 2.34.1 -