Comment 10 for bug 1952652

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix merged to puppet-ironic (stable/victoria)

Reviewed: https://review.opendev.org/c/openstack/puppet-ironic/+/821261
Committed: https://opendev.org/openstack/puppet-ironic/commit/d33a9f68d57a1c5cf391bd12cdbae8075991222a
Submitter: "Zuul (22348)"
Branch: stable/victoria

commit d33a9f68d57a1c5cf391bd12cdbae8075991222a
Author: Harald Jensås <email address hidden>
Date: Mon Nov 29 18:43:05 2021 +0100

    Fix name of iPXE efi bootrom

    In change Ia30aff290ec24972f387612851f8f630ddc9403b
    the file in tftproot was renamed from ipxe.efi to
    snponly.efi. Later in the filename was parameterized
    in change I565e3ae6388812c358e86fac49b17e0cce97b9df.

    The dnsmasq DHCP configuration was not updated to
    point to use the new filename, nor the parameter.

    This change adds 'uefi_ipxe_bootfile_name' to
    ironic::pxe::common, updates the other manifests to
    use ironic::pxe::common::uefi_ipxe_bootfile_name if
    set.

    Also add the 'uefi_ipxe_bootfile_name' parameter to
    the ironic::inspector class and update the dnsmasq
    DHCP tempalte to use the parameter.

    Backport note:
    In stable/wallaby and older, the default uefi_ipxe_bootfile_name is
    ipxe.efi(this was updated during Xena cycle), so the inconsistent usage
    doesn't happen by default. However support for customizing
    uefi_ipxe_bootfile_name is incomplete and it is fixed by this change.

    Conflicts:
            manifests/inspector.pp

    Resolved conflict caused by c7966378a036a58018ec0c1155ee6b58f52a49ca

    Closes-Bug: #1952652
    Change-Id: I1b3ccd8ad8f3ce66c66c58b1dfdca158d749c287
    (cherry picked from commit 51ea0c95eabe8dd15493dd719b8ee34079ef3bb1)
    (cherry picked from commit 2688458cb0eae1b09c50417477a27a8e8dba682b)
    (cherry picked from commit 806261407470b0085046314d84b394af5bbf5759)