From 8bf943fdb0fb70b0f71ee0f53b0f0f945a5ff9d1 Mon Sep 17 00:00:00 2001 From: Gabriel Adrian Samfira Date: Mon, 25 Mar 2024 11:51:14 +0200 Subject: [PATCH 1/2] Update coreos-cloudinit to latest main branch This change updates coreos-cloudinit to the latest flatcar-master commit. This change disables user-configdrive.service on OpenStack, as coreos-cloudinit.service already runs on OpenStack when the system is not configured via ignition. Signed-off-by: Gabriel Adrian Samfira --- .../2024-03-25-disable-user-configdrive-on-openstack.md | 1 + .../coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog/bugfixes/2024-03-25-disable-user-configdrive-on-openstack.md diff --git a/changelog/bugfixes/2024-03-25-disable-user-configdrive-on-openstack.md b/changelog/bugfixes/2024-03-25-disable-user-configdrive-on-openstack.md new file mode 100644 index 0000000000..08433b73cd --- /dev/null +++ b/changelog/bugfixes/2024-03-25-disable-user-configdrive-on-openstack.md @@ -0,0 +1 @@ +- Disable user-configdrive.service on OpenStack when config drive is used. The coreos-cloudinit.service unit already runs on OpenStack if the system is not configured via ignition. ([Flatcar#1385](https://github.com/flatcar/Flatcar/issues/1385)) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild index a9abc0901d..512ac9f8ec 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild @@ -12,7 +12,7 @@ inherit cros-workon systemd toolchain-funcs udev coreos-go if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm64" else - CROS_WORKON_COMMIT="47d54a38e766a30c7ab9caabf2292e885505ffe0" # flatcar-master + CROS_WORKON_COMMIT="7412fe91604b67d2ba66306726288392c3017403" # flatcar-3815-backport KEYWORDS="amd64 arm64" fi From 9c19e20cbff6907a35e6efc7ae74de627b68b6cb Mon Sep 17 00:00:00 2001 From: Gabriel Date: Mon, 25 Mar 2024 18:18:21 +0200 Subject: [PATCH 2/2] Update changelog/bugfixes/2024-03-25-disable-user-configdrive-on-openstack.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Kai Lüke --- .../2024-03-25-disable-user-configdrive-on-openstack.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog/bugfixes/2024-03-25-disable-user-configdrive-on-openstack.md b/changelog/bugfixes/2024-03-25-disable-user-configdrive-on-openstack.md index 08433b73cd..bcf885c871 100644 --- a/changelog/bugfixes/2024-03-25-disable-user-configdrive-on-openstack.md +++ b/changelog/bugfixes/2024-03-25-disable-user-configdrive-on-openstack.md @@ -1 +1 @@ -- Disable user-configdrive.service on OpenStack when config drive is used. The coreos-cloudinit.service unit already runs on OpenStack if the system is not configured via ignition. ([Flatcar#1385](https://github.com/flatcar/Flatcar/issues/1385)) +- Disabled user-configdrive.service on OpenStack when config drive is used, which caused the hostname to be overwritten. The coreos-cloudinit.service unit already runs on OpenStack if the system is not configured via ignition. ([Flatcar#1385](https://github.com/flatcar/Flatcar/issues/1385))