openstack/ironic
Code Issues Proposed changes

Merge "Fix typo and docstring in pxe/ipxe"

Browse Source
This commit is contained in:
Zuul 2019-03-11 07:37:58 +00:00 committed by Gerrit Code Review
commit 63d852a46b
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ironic/common/pxe_utils.py
View File

@ -422,7 +422,7 @@ def dhcp_options_for_instance(task, ipxe_enabled=False, url_boot=False):
"""Retrieves the DHCP PXE boot options. """Retrieves the DHCP PXE boot options.
:param task: A TaskManager instance. :param task: A TaskManager instance.
:param ipxe_enabled: Default false boolean that siganls if iPXE :param ipxe_enabled: Default false boolean that signals if iPXE
formatting should be returned by the method formatting should be returned by the method
for DHCP server configuration. for DHCP server configuration.
:param url_boot: Default false boolean to inform the method if :param url_boot: Default false boolean to inform the method if

9
ironic/drivers/modules/ipxe.py
View File

@ -120,10 +120,6 @@ class iPXEBoot(pxe_base.PXEBaseMixin, base.BootInterface):
:param ramdisk_params: the parameters to be passed to the ramdisk. :param ramdisk_params: the parameters to be passed to the ramdisk.
pxe driver passes these parameters as kernel command-line pxe driver passes these parameters as kernel command-line
arguments. arguments.
:param mode: Label indicating a deploy or rescue operation
being carried out on the node. Supported values are
'deploy' and 'rescue'. Defaults to 'deploy', indicating
deploy operation is being carried out.
:returns: None :returns: None
:raises: MissingParameterValue, if some information is missing in :raises: MissingParameterValue, if some information is missing in
node's driver_info or instance_info. node's driver_info or instance_info.
@ -133,6 +129,11 @@ class iPXEBoot(pxe_base.PXEBaseMixin, base.BootInterface):
operation failed on the node. operation failed on the node.
""" """
node = task.node node = task.node
# Label indicating a deploy or rescue operation being carried out on
# the node, 'deploy' or 'rescue'. Unless the node is in a rescue like
# state, the mode is set to 'deploy', indicating deploy operation is
# being carried out.
mode = deploy_utils.rescue_or_deploy_mode(node) mode = deploy_utils.rescue_or_deploy_mode(node)
# NOTE(mjturek): At this point, the ipxe boot script should # NOTE(mjturek): At this point, the ipxe boot script should

9
ironic/drivers/modules/pxe.py
View File

@ -127,10 +127,6 @@ class PXEBoot(pxe_base.PXEBaseMixin, base.BootInterface):
:param ramdisk_params: the parameters to be passed to the ramdisk. :param ramdisk_params: the parameters to be passed to the ramdisk.
pxe driver passes these parameters as kernel command-line pxe driver passes these parameters as kernel command-line
arguments. arguments.
:param mode: Label indicating a deploy or rescue operation
being carried out on the node. Supported values are
'deploy' and 'rescue'. Defaults to 'deploy', indicating
deploy operation is being carried out.
:returns: None :returns: None
:raises: MissingParameterValue, if some information is missing in :raises: MissingParameterValue, if some information is missing in
node's driver_info or instance_info. node's driver_info or instance_info.
@ -140,6 +136,11 @@ class PXEBoot(pxe_base.PXEBaseMixin, base.BootInterface):
operation failed on the node. operation failed on the node.
""" """
node = task.node node = task.node
# Label indicating a deploy or rescue operation being carried out on
# the node, 'deploy' or 'rescue'. Unless the node is in a rescue like
# state, the mode is set to 'deploy', indicating deploy operation is
# being carried out.
mode = deploy_utils.rescue_or_deploy_mode(node) mode = deploy_utils.rescue_or_deploy_mode(node)
ipxe_enabled = CONF.pxe.ipxe_enabled ipxe_enabled = CONF.pxe.ipxe_enabled
if ipxe_enabled: if ipxe_enabled: