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 2025-01-07 20:50:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cloud-init (Old) and /work/SRC/openSUSE:Factory/.cloud-init.new.1881 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cloud-init" Tue Jan 7 20:50:09 2025 rev:103 rq:1235207 version:23.3 Changes: -------- --- /work/SRC/openSUSE:Factory/cloud-init/cloud-init.changes 2024-06-17 19:27:47.362510930 +0200 +++ /work/SRC/openSUSE:Factory/.cloud-init.new.1881/cloud-init.changes 2025-01-07 20:50:20.461275268 +0100 @@ -1,0 +2,6 @@ +Mon Jan 6 13:17:05 UTC 2025 - Robert Schweikert <[email protected]> + +- Add cloud-init-wait-for-net.patch (bsc#1227237) + + Wait for udev once if we cannot find the expected MAC + +------------------------------------------------------------------- @@ -10 +16 @@ - + Brute force appraoch to skip renames if the device is already present + + Brute force approach to skip renames if the device is already present New: ---- cloud-init-wait-for-net.patch BETA DEBUG BEGIN: New: - Add cloud-init-wait-for-net.patch (bsc#1227237) + Wait for udev once if we cannot find the expected MAC BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cloud-init.spec ++++++ --- /var/tmp/diff_new_pack.6lPSA8/_old 2025-01-07 20:50:21.457316460 +0100 +++ /var/tmp/diff_new_pack.6lPSA8/_new 2025-01-07 20:50:21.461316626 +0100 @@ -53,6 +53,8 @@ Patch14: cloud-init-usr-sudoers.patch # FIXME https://github.com/canonical/cloud-init/issues/5075 Patch15: cloud-init-skip-rename.patch +# FIXME https://github.com/canonical/cloud-init/pull/5947 +Patch16: cloud-init-wait-for-net.patch BuildRequires: fdupes BuildRequires: filesystem # pkg-config is needed to find correct systemd unit dir @@ -166,6 +168,7 @@ %patch -P 13 %patch -P 14 %patch -P 15 +%patch -P 16 # patch in the full version to version.py version_pys=$(find . -name version.py -type f) ++++++ cloud-init-wait-for-net.patch ++++++ --- cloudinit/sources/helpers/openstack.py.orig +++ cloudinit/sources/helpers/openstack.py @@ -736,7 +736,14 @@ def convert_net_json(network_json=None, if not mac: raise ValueError("No mac_address or name entry for %s" % d) if mac not in known_macs: - raise ValueError("Unable to find a system nic for %s" % d) + # Let's give udev a chance to catch up + try: + util.udevadm_settle() + except subp.ProcessExecutionError: + pass + known_macs = net.get_interfaces_by_mac() + if mac not in known_macs: + raise ValueError("Unable to find a system nic for %s" % d) d["name"] = known_macs[mac] for cfg, key, fmt, targets in link_updates: --- tests/unittests/sources/test_configdrive.py.orig +++ tests/unittests/sources/test_configdrive.py @@ -389,6 +389,7 @@ class TestConfigDriveDataSource(CiTestCa M_PATH + "util.find_devs_with", "m_find_devs_with", return_value=[] ) self.tmp = self.tmp_dir() + self.allowed_subp = True def test_ec2_metadata(self): populate_dir(self.tmp, CFG_DRIVE_FILES_V2) @@ -869,6 +870,7 @@ class TestConvertNetworkData(CiTestCase) def setUp(self): super(TestConvertNetworkData, self).setUp() self.tmp = self.tmp_dir() + self.allowed_subp = True def _getnames_in_config(self, ncfg): return set(
