summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShivanand Tendulker <stendulker@gmail.com>2016-03-23 03:04:41 -0700
committerShivanand Tendulker <stendulker@gmail.com>2016-03-23 04:45:43 -0700
commit797e6f20e0f875e663320aee3f05a5491c3c784d (patch)
tree1ddff4a078c27e9d2e637b3d96ad5a77f746ebb7
parenta188a313650266cb3103e60702d0505557d8ea88 (diff)
downloadironic-5.1.0.tar.gz
Documentation update for partition image support5.1.0
Removed note that indicated agent drivers do not support deploying partition images. Updated iLO documentation indicating support for partition images for agent_ilo driver. Change-Id: I2349604344328222db5b981fa9d75523d21a5186
-rw-r--r--doc/source/deploy/install-guide.rst5
-rw-r--r--doc/source/drivers/ilo.rst16
2 files changed, 9 insertions, 12 deletions
diff --git a/doc/source/deploy/install-guide.rst b/doc/source/deploy/install-guide.rst
index a05fe332b..ceb8f14af 100644
--- a/doc/source/deploy/install-guide.rst
+++ b/doc/source/deploy/install-guide.rst
@@ -1386,11 +1386,6 @@ bare metal node to be deployed with when Ironic is responsible for
partitioning the disk; therefore choosing the disk label does not apply
when the image being deployed is a ``whole disk image``.
-.. note::
- At present the agent_* drivers do not support deploying partition
- images, therefore forcing the disk label for those drivers is not
- possible.
-
There are some edge cases where someone may want to choose a specific
disk label for the images being deployed, including but not limited to:
diff --git a/doc/source/drivers/ilo.rst b/doc/source/drivers/ilo.rst
index 14dd7daf7..b807eafa5 100644
--- a/doc/source/drivers/ilo.rst
+++ b/doc/source/drivers/ilo.rst
@@ -28,7 +28,8 @@ it from data channel which is used for deployment.
``iscsi_ilo`` and ``agent_ilo`` drivers use deployment ramdisk
built from ``diskimage-builder``. The ``iscsi_ilo`` driver deploys from
ironic conductor and supports both net-boot and local-boot of instance.
-``agent_ilo`` deploys from bare metal node and always does local-boot.
+``agent_ilo`` deploys from bare metal node and supports both net-boot
+and local-boot of instance.
``pxe_ilo`` driver uses PXE/iSCSI for deployment (just like normal PXE driver)
and deploys from ironic conductor. Additionally it supports automatic setting of
@@ -378,7 +379,9 @@ Features
* Remote Console
* HW Sensors
* IPA runs on the bare metal node and pulls the image directly from swift.
-* IPA deployed instances always boots from local disk.
+* Supports booting the instance from virtual media (netboot) as well as booting
+ locally from disk. By default, the instance will always boot from virtual
+ media for partition images.
* Segregates management info from data channel.
* UEFI Boot Support
* UEFI Secure Boot Support
@@ -948,11 +951,10 @@ intermediate images on conductor as described in
Deploy Process
~~~~~~~~~~~~~~
-``iscsi_ilo`` supports both netboot and localboot, while ``agent_ilo`` supports
-only localboot. Refer to `Netboot in standalone ironic`_ and
-`Localboot in standalone ironic`_ for details of deploy process
-for netboot and localboot respectively. For ``pxe_ilo``, the deploy process
-is same as native ``pxe_ipmitool`` driver.
+``iscsi_ilo`` and ``agent_ilo`` supports both netboot and localboot. Refer
+to `Netboot in standalone ironic`_ and `Localboot in standalone ironic`_
+for details of deploy process for netboot and localboot respectively.
+For ``pxe_ilo``, the deploy process is same as native ``pxe_ipmitool`` driver.
Deploy Process
==============