summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2021-01-05 11:32:25 +0000
committerGerrit Code Review <review@openstack.org>2021-01-05 11:32:25 +0000
commitb4cb934e592d522381389e5510aa964fa2211153 (patch)
tree6ce799a81e143538343d734d6d38a92b085cba1e
parent4ae5375c0a2a33231c0fc1a91291975f17732c40 (diff)
parent29d5c7ddd886ce14747ef67c56dc3f315ca18c57 (diff)
downloadironic-b4cb934e592d522381389e5510aa964fa2211153.tar.gz
Merge "Include HeartbeatMixin in the ramdisk deploy" into stable/victoria
-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.