summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Tantsur <dtantsur@protonmail.com>2020-12-16 19:04:19 +0100
committerDmitry Tantsur <dtantsur@protonmail.com>2020-12-18 20:47:20 +0000
commit29d5c7ddd886ce14747ef67c56dc3f315ca18c57 (patch)
tree48a5329de3a302e83e12d75c86965419d9bf4481
parentf847799c8a4a2c83b379960e479d7f0d57945a9d (diff)
downloadironic-29d5c7ddd886ce14747ef67c56dc3f315ca18c57.tar.gz
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)
-rw-r--r--ironic/drivers/modules/pxe.py3
-rw-r--r--releasenotes/notes/ramdisk-clean-2d3b033a401b911b.yaml5
2 files changed, 7 insertions, 1 deletions
diff --git a/ironic/drivers/modules/pxe.py b/ironic/drivers/modules/pxe.py
index 3463f3543..222e952da 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 000000000..022372fb7
--- /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.