From 870cb1beb229d6f856da4c974ca7e73d3d89d56d Mon Sep 17 00:00:00 2001 From: Jan Horstmann Date: Fri, 30 Aug 2019 15:52:01 +0200 Subject: [PATCH] Use net_default_mac in ansible/roles/ironic/templates/ironic_pxe_uefi.default.j2 Upstream ironic went from $net_default_ip to $net_default_mac in ironic/drivers/modules/master_grub_cfg.txt with https://review.opendev.org/#/c/578959/ This commit makes the same change for ansible/roles/ironic/templates/ironic_pxe_uefi.default.j2 Using $net_default_ip breaks ironic standalone deployments with [dhcp]dhcp_provider = none Change-Id: I2ca9a66d2bdb0aab5cd9936c8be8206e6ade3bd5 Closes-Bug: 1842078 --- ansible/roles/ironic/templates/ironic_pxe_uefi.default.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/ironic/templates/ironic_pxe_uefi.default.j2 b/ansible/roles/ironic/templates/ironic_pxe_uefi.default.j2 index 1546765077..375ca8a89d 100644 --- a/ansible/roles/ironic/templates/ironic_pxe_uefi.default.j2 +++ b/ansible/roles/ironic/templates/ironic_pxe_uefi.default.j2 @@ -3,5 +3,5 @@ set timeout=5 set hidden_timeout_quiet=false menuentry "master" { - configfile /tftpboot/$net_default_ip.conf + configfile /tftpboot/$net_default_mac.conf }