Merge https://github.com/openstack/ironic:master (eda12b9) into main

ironic/db/sqlalchemy/api.py

@@ -1481,13 +1481,23 @@ def delete_conductor(self, hostname):
             # orphaned power state requests after deletion.
             self.clear_node_target_power_state(hostname)
 
+            conductor_id_subquery = (
+                session.query(models.Conductor.id).where(
+                    models.Conductor.hostname == hostname
+                ).scalar_subquery()
+            )
+
+            # Clear conductor_affinity FK references.
+            session.execute(
+                sa.update(models.Node).where(
+                    models.Node.conductor_affinity == conductor_id_subquery
+                ).values(conductor_affinity=None)
+            )
+
             # Delete conductor hardware interfaces
             query = sa.delete(models.ConductorHardwareInterfaces).where(
-                models.ConductorHardwareInterfaces.conductor_id == (
-                    session.query(models.Conductor.id).where(
-                        models.Conductor.hostname == hostname
-                    ).scalar_subquery()
-                )
+                models.ConductorHardwareInterfaces.conductor_id
+                == conductor_id_subquery
             )
             session.execute(query)
 

ironic/tests/unit/db/test_conductor.py

@@ -555,3 +555,21 @@ def test_delete_conductor_clears_hardware_interfaces(self):
         interfaces = self.dbapi.list_conductor_hardware_interfaces(
             conductor['id'])
         self.assertEqual([], interfaces)
+
+    def test_delete_conductor_clears_conductor_affinity(self):
+        conductor = self.dbapi.register_conductor(
+            {'hostname': 'test-conductor',
+             'drivers': ['fake'],
+             'conductor_group': 'test-group'})
+
+        node = self.dbapi.create_node({
+            'uuid': 'test-node-uuid',
+            'driver': 'fake',
+            'conductor_affinity': conductor['id']
+        })
+
+        self.assertEqual(conductor['id'], node.conductor_affinity)
+        self.dbapi.delete_conductor('test-conductor')
+
+        node = self.dbapi.get_node_by_uuid('test-node-uuid')
+        self.assertIsNone(node.conductor_affinity)