openstack/ironic
Code Issues Proposed changes

Merge "Fix access to CONF in dhcp_options_for_instance"

Browse Source
This commit is contained in:
Jenkins 2017-04-05 15:28:27 +00:00 committed by Gerrit Code Review
commit f9ccfd98cf
1 changed files with 1 additions and 1 deletions

2
ironic/common/pxe_utils.py

@ -279,7 +279,7 @@ def dhcp_options_for_instance(task):
if CONF.pxe.ipxe_enabled:
script_name = os.path.basename(CONF.pxe.ipxe_boot_script)
ipxe_script_url = '/'.join([CONF.deploy.http_url, script_name])
dhcp_provider_name = dhcp_factory.CONF.dhcp.dhcp_provider
dhcp_provider_name = CONF.dhcp.dhcp_provider
# if the request comes from dumb firmware send them the iPXE
# boot image.
if dhcp_provider_name == 'neutron':