Revert "fix: upgrade cloud-init to v23.4.1 (#7065)"

This reverts commit fc07dc5.

Author: jslobodzian

SPECS/cloud-init/cloud-init.signatures.json

@@ -1,6 +1,6 @@
 {
  "Signatures": {
   "10-azure-kvp.cfg": "79e0370c010be5cd4717960e4b414570c9ec6e6d29aede77ccecc43d2b03bb9a",
-  "cloud-init-23.4.1.tar.gz": "f12d207cf147ab981787487d38cda09ee71975505df224c96a6cf1d59f53ca2f"
+  "cloud-init-23.3.tar.gz": "1a5a54369f78891b79f43061c1ff0fb31e2bd74ff9527d7150ddd6517c3e2b07"
  }
 }

SPECS/cloud-init/cloud-init.spec

@@ -1,6 +1,6 @@
 Summary:        Cloud instance init scripts
 Name:           cloud-init
-Version:        23.4.1
+Version:        23.3
 Release:        1%{?dist}
 License:        GPLv3
 Vendor:         Microsoft Corporation
@@ -9,6 +9,7 @@ Group:          System Environment/Base
 URL:            https://launchpad.net/cloud-init
 Source0:        https://launchpad.net/cloud-init/trunk/%{version}/+download/%{name}-%{version}.tar.gz
 Source1:        10-azure-kvp.cfg
+Patch0:         overrideDatasourceDetection.patch
 %define cl_services cloud-config.service cloud-config.target cloud-final.service cloud-init.service cloud-init.target cloud-init-local.service
 BuildRequires:  automake
 BuildRequires:  dbus
@@ -79,7 +80,7 @@ python3 setup.py build
 %install
 %{py3_install "--init-system=systemd"}
 
-python3 tools/render-template --variant mariner > %{buildroot}/%{_sysconfdir}/cloud/cloud.cfg
+python3 tools/render-cloudcfg --variant mariner > %{buildroot}/%{_sysconfdir}/cloud/cloud.cfg
 sed -i "s,@@PACKAGED_VERSION@@,%{version}-%{release}," %{buildroot}/%{python3_sitelib}/cloudinit/version.py
 
 %if "%{_arch}" == "aarch64"
@@ -142,10 +143,6 @@ make check %{?_smp_mflags}
 %config(noreplace) %{_sysconfdir}/cloud/cloud.cfg.d/10-azure-kvp.cfg
 
 %changelog
-* Tue Dec 19 2023 Chris Co <chrco@microsoft.com> - 23.4.1-1
-- Upgrade cloud-init to 23.4.1
-- Remove overrideDatasourceDetection patch since it is now in 23.4 source
-
 * Tue Oct 10 2023 Minghe Ren <mingheren@microsoft.com> - 23.3-1
 - Upgrade to cloud-init 23.3 and remove unnecessary testGetInterfacesUnitTest.patch
 

SPECS/cloud-init/overrideDatasourceDetection.patch

@@ -0,0 +1,35 @@
+From 35988cc4452f7df42e3c1b462731489bd33dade6 Mon Sep 17 00:00:00 2001
+From: Chris Patterson <cpatterson@microsoft.com>
+Date: Mon, 11 Sep 2023 16:56:06 -0400
+Subject: [PATCH] sources: do not override datasource detection if None is in
+ list
+
+Users with datasource_list = [Azure, None] started failing to boot
+properly outside of Azure with the changes to override datasource detection.
+
+If the fallback "None" is included in the datasource_list, do not treat
+the system as configured with a single datasource.
+
+If users want to force a single datasource regardless of detection,
+they can do so by removing None from the list.
+
+Signed-off-by: Chris Patterson <cpatterson@microsoft.com>
+---
+ cloudinit/sources/__init__.py | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff -ruN a/cloudinit/sources/__init__.py b/cloudinit/sources/__init__.py
+--- a/cloudinit/sources/__init__.py	2023-08-28 09:20:24.000000000 -0700
++++ b/cloudinit/sources/__init__.py	2023-09-13 15:00:23.287549869 -0700
+@@ -352,10 +352,7 @@
+                 self,
+             )
+             return True
+-        elif self.sys_cfg.get("datasource_list", []) in (
+-            [self.dsname],
+-            [self.dsname, "None"],
+-        ):
++        elif self.sys_cfg.get("datasource_list", []) == [self.dsname]:
+             LOG.debug(
+                 "Machine is configured to run on single datasource %s.", self
+             )

cgmanifest.json

@@ -1807,8 +1807,8 @@
         "type": "other",
         "other": {
           "name": "cloud-init",
-          "version": "23.4.1",
-          "downloadUrl": "https://launchpad.net/cloud-init/trunk/23.4.1/+download/cloud-init-23.4.1.tar.gz"
+          "version": "23.3",
+          "downloadUrl": "https://launchpad.net/cloud-init/trunk/23.3/+download/cloud-init-23.3.tar.gz"
         }
       }
     },