openstack/ironic
Code Issues Proposed changes

Merge "Follow-up to always link MAC address files"

Browse Source
This commit is contained in:
Zuul 2018-08-09 13:21:46 +00:00 committed by Gerrit Code Review
commit 12f962d6f5
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ironic/common/pxe_utils.py
View File

@ -265,9 +265,9 @@ def create_pxe_config(task, pxe_options, template=None):
pxe_config = utils.render_template(template, params) pxe_config = utils.render_template(template, params)
utils.write_to_file(pxe_config_file_path, pxe_config) utils.write_to_file(pxe_config_file_path, pxe_config)
if is_uefi_boot_mode and not CONF.pxe.ipxe_enabled:
# Always write the mac addresses # Always write the mac addresses
_link_mac_pxe_configs(task) _link_mac_pxe_configs(task)
if is_uefi_boot_mode and not CONF.pxe.ipxe_enabled:
try: try:
_link_ip_address_pxe_configs(task, hex_form) _link_ip_address_pxe_configs(task, hex_form)
# NOTE(TheJulia): The IP address support will fail if the # NOTE(TheJulia): The IP address support will fail if the
@ -281,8 +281,6 @@ def create_pxe_config(task, pxe_options, template=None):
LOG.error('Unable to create boot config, IP address ' LOG.error('Unable to create boot config, IP address '
'was unable to be retrieved. %(error)s', 'was unable to be retrieved. %(error)s',
{'error': e}) {'error': e})
else:
_link_mac_pxe_configs(task)
def create_ipxe_boot_script(): def create_ipxe_boot_script():