openstack/ironic
Code Issues Proposed changes

Follow-up to always link MAC address files

Browse Source 
Changing based upon review feedback to always call for
file creation instead of have it inside of the conditional.

Change-Id: I72614ebe8f5c06809f52c5f11c2ff2917a4336cc
This commit is contained in:
Julia Kreger 2018-08-06 11:39:12 -07:00
parent b464a195bb
commit 54c508a1b3
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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)
utils.write_to_file(pxe_config_file_path, pxe_config)
# Always write the mac addresses
_link_mac_pxe_configs(task)
if is_uefi_boot_mode and not CONF.pxe.ipxe_enabled:
# Always write the mac addresses
_link_mac_pxe_configs(task)
try:
_link_ip_address_pxe_configs(task, hex_form)
# 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 '
'was unable to be retrieved. %(error)s',
{'error': e})
else:
_link_mac_pxe_configs(task)
def create_ipxe_boot_script():