From 68cf358c8f5a0850ee1879ec234296de7ac70f13 Mon Sep 17 00:00:00 2001 From: Alejandro Ripoll Date: Tue, 28 May 2024 14:30:54 +0200 Subject: [PATCH] OpenStack: Changed metadata hostname source order Change `flatcar-openstack-hostname.service` to use afterburn `openstack` provider implemented on coreos/afterburn#462 instead of `openstack-metadata`. BootEngine PR: flatcar/bootengine#96 --- changelog/changes/2024-06-03-openstack-configdrive.md | 1 + ...ootengine-0.0.38-r30.ebuild => bootengine-0.0.38-r31.ebuild} | 0 .../coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog/changes/2024-06-03-openstack-configdrive.md rename sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/{bootengine-0.0.38-r30.ebuild => bootengine-0.0.38-r31.ebuild} (100%) diff --git a/changelog/changes/2024-06-03-openstack-configdrive.md b/changelog/changes/2024-06-03-openstack-configdrive.md new file mode 100644 index 00000000000..25be48d23d1 --- /dev/null +++ b/changelog/changes/2024-06-03-openstack-configdrive.md @@ -0,0 +1 @@ +- OpenStack: Changed metadata hostname source order. The service first tries with the config drive then fallback on the metadata service. ([bootengine#96](https://github.com/flatcar/bootengine/pull/96)) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r30.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r31.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r30.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r31.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild index cf8cb1db549..75931c150ba 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild @@ -10,7 +10,7 @@ CROS_WORKON_REPO="https://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="8da532c809c89a9c434ada0fa9532a1c1bf49f4c" # flatcar-master + CROS_WORKON_COMMIT="fb2631ce5e6a21d044c8dca73f59db01f9d5abcf" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi