From 3f564a10d06f6ff6658961c07ab30209e0bc86a8 Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Thu, 10 Apr 2025 15:12:41 -0500 Subject: [PATCH] fix(nova): patch has been merged upstream so it doesn't apply This patch cannot be applied because its been merged upstream and pulled into the stable branch which this container is based on. --- ...nic-fix-logging-of-validation-errors.patch | 46 ------------------- containers/nova/patches/series | 1 - 2 files changed, 47 deletions(-) delete mode 100644 containers/nova/patches/0001-ironic-fix-logging-of-validation-errors.patch diff --git a/containers/nova/patches/0001-ironic-fix-logging-of-validation-errors.patch b/containers/nova/patches/0001-ironic-fix-logging-of-validation-errors.patch deleted file mode 100644 index 2e0d82a03..000000000 --- a/containers/nova/patches/0001-ironic-fix-logging-of-validation-errors.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 092752cac3f1821b2a72a2d255a4538b78ed543d Mon Sep 17 00:00:00 2001 -From: Doug Goldstein -Date: Mon, 17 Feb 2025 17:19:16 -0600 -Subject: [PATCH] ironic: fix logging of validation errors - -When validation of the node fails, since switching to the SDK the -address of the ValidationResult object is displayed instead of the -actual message. This has been broken since patch -Ibb5b168ee0944463b996e96f033bd3dfb498e304. - -Change-Id: I8fbdaadd125ece6a3050b2fbb772a7bd5d7e5304 -Signed-off-by: Doug Goldstein ---- - nova/virt/ironic/driver.py | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/nova/virt/ironic/driver.py b/nova/virt/ironic/driver.py -index 9d6bd32126..7279af09ad 100644 ---- a/nova/virt/ironic/driver.py -+++ b/nova/virt/ironic/driver.py -@@ -1213,14 +1213,20 @@ class IronicDriver(virt_driver.ComputeDriver): - ): - # something is wrong. undo what we have done - self._cleanup_deploy(node, instance, network_info) -+ deploy_msg = ("No Error" if validate_chk['deploy'].result -+ else validate_chk['deploy'].reason) -+ power_msg = ("No Error" if validate_chk['power'].result -+ else validate_chk['power'].reason) -+ storage_msg = ("No Error" if validate_chk['storage'].result -+ else validate_chk['storage'].reason) - raise exception.ValidationError(_( - "Ironic node: %(id)s failed to validate. " - "(deploy: %(deploy)s, power: %(power)s, " - "storage: %(storage)s)") - % {'id': node.id, -- 'deploy': validate_chk['deploy'], -- 'power': validate_chk['power'], -- 'storage': validate_chk['storage']}) -+ 'deploy': deploy_msg, -+ 'power': power_msg, -+ 'storage': storage_msg}) - - # Config drive - configdrive_value = None --- -2.39.5 (Apple Git-154) diff --git a/containers/nova/patches/series b/containers/nova/patches/series index c0a72cc6a..82b72e118 100644 --- a/containers/nova/patches/series +++ b/containers/nova/patches/series @@ -1,2 +1 @@ 0001_trunk_details_metadata.patch -0001-ironic-fix-logging-of-validation-errors.patch