openstack/ironic
Code Issues Proposed changes

Merge "PXE: avoid trailing dots in exception messages"

Browse Source
This commit is contained in:
Zuul 2021-09-29 10:30:18 +00:00 committed by Gerrit Code Review
commit dc50636006
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ironic/drivers/modules/pxe_base.py
View File

@ -341,14 +341,14 @@ class PXEBaseMixin(object):
if not driver_utils.get_node_mac_addresses(task): if not driver_utils.get_node_mac_addresses(task):
raise exception.MissingParameterValue( raise exception.MissingParameterValue(
_("Node %s does not have any port associated with it.") _("Node %s does not have any port associated with it")
% node.uuid) % node.uuid)
if self.ipxe_enabled: if self.ipxe_enabled:
if not CONF.deploy.http_url or not CONF.deploy.http_root: if not CONF.deploy.http_url or not CONF.deploy.http_root:
raise exception.MissingParameterValue(_( raise exception.MissingParameterValue(_(
"iPXE boot is enabled but no HTTP URL or HTTP " "iPXE boot is enabled but no HTTP URL or HTTP "
"root was specified.")) "root was specified"))
# NOTE(zer0c00l): When 'kickstart' boot option is used we need to store # NOTE(zer0c00l): When 'kickstart' boot option is used we need to store
# kickstart and squashfs files in http_root directory. These files # kickstart and squashfs files in http_root directory. These files
@ -358,12 +358,12 @@ class PXEBaseMixin(object):
if not CONF.deploy.http_url or not CONF.deploy.http_root: if not CONF.deploy.http_url or not CONF.deploy.http_root:
raise exception.MissingParameterValue(_( raise exception.MissingParameterValue(_(
"'kickstart' boot option is set on the node but no HTTP " "'kickstart' boot option is set on the node but no HTTP "
"URL or HTTP root was specified.")) "URL or HTTP root was specified"))
if not CONF.anaconda.default_ks_template: if not CONF.anaconda.default_ks_template:
raise exception.MissingParameterValue(_( raise exception.MissingParameterValue(_(
"'kickstart' boot option is set on the node but no " "'kickstart' boot option is set on the node but no "
"default kickstart template is specified.")) "default kickstart template is specified"))
# Check the trusted_boot capabilities value. # Check the trusted_boot capabilities value.
deploy_utils.validate_capabilities(node) deploy_utils.validate_capabilities(node)
@ -390,7 +390,7 @@ class PXEBaseMixin(object):
and node.instance_info.get('boot_iso')): and node.instance_info.get('boot_iso')):
raise exception.InvalidParameterValue(_( raise exception.InvalidParameterValue(_(
"An 'image_source' and 'boot_iso' parameter may not be " "An 'image_source' and 'boot_iso' parameter may not be "
"specified at the same time.")) "specified at the same time"))
pxe_utils.parse_driver_info(node) pxe_utils.parse_driver_info(node)