From 0cff10309b23455b22b91b2bea06f78445bc364a Mon Sep 17 00:00:00 2001 From: David Eichin Date: Tue, 6 Feb 2024 16:18:22 +0100 Subject: [PATCH] changelog: remove cloudsigma custom cloudinit service configuration CloudSigma uses a serial port to transfer metadata into a running instance. Because the service was overwritten with the configuration "restart" it was possible that the previous instance got interrupted. This left the serial connection in an non-deterministic state as the next user would get output from the previous request. The service in general was not needed as the cloud oem is already set to cloudsigma. --- ...dsigma-remove-custom-cloudinit-service-config.md | 1 + .../oem-cloudsigma/files/cloud-config.yml | 13 ------------- ...0.3-r4.ebuild => oem-cloudsigma-0.0.3-r5.ebuild} | 0 3 files changed, 1 insertion(+), 13 deletions(-) create mode 100644 changelog/bugfixes/2024-02-06-cloudsigma-remove-custom-cloudinit-service-config.md rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/{oem-cloudsigma-0.0.3-r4.ebuild => oem-cloudsigma-0.0.3-r5.ebuild} (100%) diff --git a/changelog/bugfixes/2024-02-06-cloudsigma-remove-custom-cloudinit-service-config.md b/changelog/bugfixes/2024-02-06-cloudsigma-remove-custom-cloudinit-service-config.md new file mode 100644 index 0000000000..90d7ab894d --- /dev/null +++ b/changelog/bugfixes/2024-02-06-cloudsigma-remove-custom-cloudinit-service-config.md @@ -0,0 +1 @@ +- Removed custom CloudSigma coreos-cloudinit service configuration since it will be called with the cloudsigma oem anyway. The restart of the service can also cause the serial port to be stuck in an nondeterministic state which breaks future runs. diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/cloud-config.yml index 757796e101..f799bf4b4c 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/cloud-config.yml +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/cloud-config.yml @@ -1,19 +1,6 @@ #cloud-config coreos: - units: - - name: oem-cloudinit.service - command: restart - runtime: yes - content: | - [Unit] - Description=Cloudinit from CloudSigma metadata - - [Service] - Type=oneshot - ExecStartPre=stty -F /dev/ttyS1 raw -echo - ExecStart=/usr/bin/coreos-cloudinit --oem=cloudsigma - oem: id: cloudsigma name: CloudSigma diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.3-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.3-r5.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.3-r4.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.3-r5.ebuild