openstack/kolla-ansible
Code Issues Proposed changes

Use net_default_mac in ansible/roles/ironic/templates/ironic_pxe_uefi.default.j2

Browse Source 
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
(cherry picked from commit 870cb1beb2)
This commit is contained in:
Jan Horstmann 2019-08-30 15:52:01 +02:00 committed by Mark Goddard
parent c898fe01b3
commit 1067aed2cb
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/ironic/templates/ironic_pxe_uefi.default.j2
View File

@ -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
}