commit cloud-init for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package cloud-init for openSUSE:Factory 
checked in at 2024-03-29 13:09:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cloud-init (Old)
 and      /work/SRC/openSUSE:Factory/.cloud-init.new.1905 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "cloud-init"

Fri Mar 29 13:09:29 2024 rev:98 rq:1163386 version:23.3

Changes:
--------
--- /work/SRC/openSUSE:Factory/cloud-init/cloud-init.changes    2024-03-07 
18:28:04.678050555 +0100
+++ /work/SRC/openSUSE:Factory/.cloud-init.new.1905/cloud-init.changes  
2024-03-29 13:10:00.161024236 +0100
@@ -1,0 +2,7 @@
+Thu Mar 28 12:22:05 UTC 2024 - Robert Schweikert <rjsch...@suse.com>
+
+- Add  cloud-init-ds-deterministic.patch (bsc#1221132)
+  + Do not guess a data source when checking for a CloudStack
+    environment
+
+-------------------------------------------------------------------

New:
----
  cloud-init-ds-deterministic.patch

BETA DEBUG BEGIN:
  New:
- Add  cloud-init-ds-deterministic.patch (bsc#1221132)
  + Do not guess a data source when checking for a CloudStack
BETA DEBUG END:

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ cloud-init.spec ++++++
--- /var/tmp/diff_new_pack.GJZAO6/_old  2024-03-29 13:10:00.873050407 +0100
+++ /var/tmp/diff_new_pack.GJZAO6/_new  2024-03-29 13:10:00.873050407 +0100
@@ -43,6 +43,8 @@
 Patch9:        cloud-init-pckg-reboot.patch
 # FIXME
 Patch10:       cloud-init-skip-empty-conf.patch
+# FIXME (ttps://github.com/canonical/cloud-init/issues/5075)
+Patch11:       cloud-init-ds-deterministic.patch
 BuildRequires:  fdupes
 BuildRequires:  filesystem
 # pkg-config is needed to find correct systemd unit dir
@@ -151,6 +153,7 @@
 %patch -P 8
 %patch -P 9
 %patch -P 10
+%patch -P 11
 
 # patch in the full version to version.py
 version_pys=$(find . -name version.py -type f)

++++++ cloud-init-ds-deterministic.patch ++++++
--- tests/unittests/test_ds_identify.py.orig
+++ tests/unittests/test_ds_identify.py
@@ -1488,7 +1488,6 @@ VALID_CFG = {
     },
     "IBMCloud-metadata": {
         "ds": "IBMCloud",
-        "policy_dmi": POLICY_FOUND_ONLY,
         "mocks": [
             MOCK_VIRT_IS_XEN,
             {"name": "is_ibm_provisioning", "ret": shell_false},
@@ -1555,7 +1554,6 @@ VALID_CFG = {
     },
     "IBMCloud-nodisks": {
         "ds": "IBMCloud",
-        "policy_dmi": POLICY_FOUND_ONLY,
         "mocks": [
             MOCK_VIRT_IS_XEN,
             {"name": "is_ibm_provisioning", "ret": shell_false},
@@ -1642,7 +1640,6 @@ VALID_CFG = {
     },
     "VMware-NoValidTransports": {
         "ds": "VMware",
-        "policy_dmi": POLICY_FOUND_ONLY,
         "mocks": [
             MOCK_VIRT_IS_VMWARE,
         ],
@@ -1665,7 +1662,6 @@ VALID_CFG = {
     },
     "VMware-EnvVar-NoData": {
         "ds": "VMware",
-        "policy_dmi": POLICY_FOUND_ONLY,
         "mocks": [
             {
                 "name": "vmware_has_envvar_vmx_guestinfo",
@@ -1775,7 +1771,6 @@ VALID_CFG = {
     },
     "VMware-GuestInfo-NoData": {
         "ds": "VMware",
-        "policy_dmi": POLICY_FOUND_ONLY,
         "mocks": [
             {
                 "name": "vmware_has_rpctool",
--- tools/ds-identify.orig
+++ tools/ds-identify
@@ -739,9 +739,6 @@ probe_floppy() {
 dscheck_CloudStack() {
     is_container && return ${DS_NOT_FOUND}
     dmi_product_name_matches "CloudStack*" && return $DS_FOUND
-    if [ "$DI_VIRT" = "vmware" ] || [ "$DI_VIRT" = "xen" ]; then
-        return $DS_MAYBE
-    fi
     return $DS_NOT_FOUND
 }