From 9e89af6f5916dd119b877653819163bef273cca4 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Thu, 23 Dec 2021 10:21:40 +0000 Subject: [PATCH] bifrost: preempt change in defaults for TFTP and HTTP boot paths Bifrost in Yoga will change the default TFTP and HTTP boot directories to reside under /var/lib/ironic/. We already avoid the cross-filesystem linking issue that the patch aims to address, by overriding tftp_master_path. Avoid this breaking us by reverting to the previous defaults. Needed-By: https://review.opendev.org/c/openstack/bifrost/+/822743 Change-Id: Idc54c78c618ae90b4d933c2c401bb1789b0abd36 --- ansible/roles/bifrost/templates/bifrost.yml.j2 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ansible/roles/bifrost/templates/bifrost.yml.j2 b/ansible/roles/bifrost/templates/bifrost.yml.j2 index 9660050f5c..9c5c2dcc7d 100644 --- a/ansible/roles/bifrost/templates/bifrost.yml.j2 +++ b/ansible/roles/bifrost/templates/bifrost.yml.j2 @@ -20,3 +20,9 @@ network_interface: "{{ bifrost_network_interface }}" # during deployment. If we use a directory under /httpboot to store the # master images this issue is avoided. ironic_tftp_master_path: "/httpboot/master_images" + +# Bifrost in Yoga changed the default TFTP and HTTP boot directories to reside +# under /var/lib/ironic/. Avoid this breaking us by reverting to the previous +# defaults. https://review.opendev.org/c/openstack/bifrost/+/822743 +tftp_boot_folder: "/tftpboot" +http_boot_folder: "/httpboot"