From 29d5c7ddd886ce14747ef67c56dc3f315ca18c57 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Wed, 16 Dec 2020 19:04:19 +0100 Subject: [PATCH] Include HeartbeatMixin in the ramdisk deploy Otherwise cleaning gets stuck forever because there is no heartbeat implementation to use. Change-Id: I3589038001b98c866f47339ac8d65edfb891ed79 (cherry picked from commit ca37578a0ac6d68a3a7142f189f64735e85b4e48) --- ironic/drivers/modules/pxe.py | 3 ++- releasenotes/notes/ramdisk-clean-2d3b033a401b911b.yaml | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/ramdisk-clean-2d3b033a401b911b.yaml diff --git a/ironic/drivers/modules/pxe.py b/ironic/drivers/modules/pxe.py index 3463f3543c..222e952dac 100644 --- a/ironic/drivers/modules/pxe.py +++ b/ironic/drivers/modules/pxe.py @@ -37,7 +37,8 @@ class PXEBoot(pxe_base.PXEBaseMixin, base.BootInterface): capabilities = ['ramdisk_boot', 'pxe_boot'] -class PXERamdiskDeploy(agent_base.AgentBaseMixin, base.DeployInterface): +class PXERamdiskDeploy(agent_base.AgentBaseMixin, agent_base.HeartbeatMixin, + base.DeployInterface): def get_properties(self, task): return {} diff --git a/releasenotes/notes/ramdisk-clean-2d3b033a401b911b.yaml b/releasenotes/notes/ramdisk-clean-2d3b033a401b911b.yaml new file mode 100644 index 0000000000..022372fb79 --- /dev/null +++ b/releasenotes/notes/ramdisk-clean-2d3b033a401b911b.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Fixes cleaning with the ``ramdisk`` deploy interface by reusing the same + procedure as for the ``direct`` deploy interface.