From 54c508a1b3288e80bfdc347486dd1daf7b0df78a Mon Sep 17 00:00:00 2001 From: Julia Kreger Date: Mon, 6 Aug 2018 11:39:12 -0700 Subject: [PATCH] Follow-up to always link MAC address files Changing based upon review feedback to always call for file creation instead of have it inside of the conditional. Change-Id: I72614ebe8f5c06809f52c5f11c2ff2917a4336cc --- ironic/common/pxe_utils.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ironic/common/pxe_utils.py b/ironic/common/pxe_utils.py index cb8036d7bd..ede0bd81b5 100644 --- a/ironic/common/pxe_utils.py +++ b/ironic/common/pxe_utils.py @@ -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():