diff options
| author | Shivanand Tendulker <stendulker@gmail.com> | 2017-08-30 03:50:32 -0400 |
|---|---|---|
| committer | Shivanand Tendulker <stendulker@gmail.com> | 2018-04-18 02:49:37 -0400 |
| commit | 4fa1075b95e2e5262f98395275590dcd3833ab74 (patch) | |
| tree | 6e2a0ab81b8aa35a9c90f5cce02d10aded31ed8e /ironic/drivers/modules/pxe.py | |
| parent | 46ee76aa461cd012a2b39dcb16c414957c463b72 (diff) | |
| download | ironic-4fa1075b95e2e5262f98395275590dcd3833ab74.tar.gz | |
Fix ``agent`` deploy interface to call ``boot.prepare_instance``
``agent`` deploy interface do not call ``boot.prepare_instance``
if image being provisioned is whole disk image. This commit fixes
that issue.
It also updates ``validate`` method of neutron network interface
module to validate if it can support boot options requested for
instance image.
Change-Id: Ibd49d65f4512f2fa417794b66f4007d82f02e2ac
Story: 1713916
Task: 9259
Story: 1750958
Task: 9288
Diffstat (limited to 'ironic/drivers/modules/pxe.py')
| -rw-r--r-- | ironic/drivers/modules/pxe.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ironic/drivers/modules/pxe.py b/ironic/drivers/modules/pxe.py index 8ce679a4f..e43cdf5d1 100644 --- a/ironic/drivers/modules/pxe.py +++ b/ironic/drivers/modules/pxe.py @@ -639,7 +639,10 @@ class PXEBoot(base.BootInterface): LOG.warning("The disk id for the whole disk image can't " "be found, unable to switch the pxe config " "from deployment mode to service (boot) mode " - "for node %(node)s", {"node": task.node.uuid}) + "for node %(node)s. Booting the instance " + "from disk.", {"node": task.node.uuid}) + pxe_utils.clean_up_pxe_config(task) + boot_device = boot_devices.DISK else: _build_service_pxe_config(task, instance_image_info, root_uuid_or_disk_id) |