.cloud-init.metadata

@@ -0,0 +1 @@
+e73116733f5636eb4bc1a5e47e802c3635b9bfa2 SOURCES/23.4.tar.gz

.gitignore

@@ -1,3 +1 @@
-*.rpm
-*.tar.gz
-results_cloud-init
+SOURCES/23.4.tar.gz

0002-downstream-Setting-autoconnect-priority-setting-for-.patch

@@ -1,772 +0,0 @@
-From aa64b67f0d62c78f7a879df4a09124fd82fc60ac Mon Sep 17 00:00:00 2001
-From: Ani Sinha <anisinha@redhat.com>
-Date: Wed, 13 Dec 2023 11:55:16 +0530
-Subject: [PATCH] downstream: Setting autoconnect priority setting for
- network-scripts
-
-Changes for 24.1.2 (c10s):
- - Fixed additional unit tests.
-
-Changes for 23.4 (c9s):
-
-Squashed the following three downstream only commits from RHEL 9.3:
-
-Commit 1:
-
-Setting highest autoconnect priority for network-scripts
-
-RH-Author: Eduardo Otubo <otubo@redhat.com>
-RH-MergeRequest: 22: Setting highest autoconnect priority for network-scripts
-RH-Commit: [1/1] 34f1d62f8934a983a124df95b861a1e448681d3b (otubo/cloud-init-src)
-RH-Bugzilla: 2036060
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-
-Set the highest autoconnect priority for network-scripts which is
-loaded by NetworkManager ifcfg-rh plugin.  Note that keyfile is the only
-and default existing plugin on RHEL9, by setting the highest autoconnect
-priority for network-scripts, NetworkManager will activate
-network-scripts but keyfile.  Network-scripts path:
-
-Since this is a blocking issue, we decided to have this one-liner
-downstream-only patch so we can move forward and have a better
-NetworkManager support later on the release.
-
-rhbz: 2036060
-x-downstream-only: yes
-
-Commit 2:
-
-net/sysconfig: do not use the highest autoconnect priority
-
-Using the highest priority is a very big hammer that we may not want to use. We
-may want users to override the cloud init generated ifcfg files for custom
-configuration of interfaces. If cloud init uses the highest priority, nothing
-can beat it. Hence lower the priority to 120 allowing values from 121 to 999
-to be used by users if they want to use a custom interface nm keyfile.
-
-X-downstream-only: true
-
-Suggested-by: thaller@redhat.com
-fixes: c589da20eb92231 ("Setting highest autoconnect priority for network-scripts")
-
-Commit 3:
-
-test fixes: update tests to reflect AUTOCONNECT_PRIORITY setting
-
-X-downstream-only: true
-fixes: 0a2c6b6118ff ("net/sysconfig: do not use the highest autoconnect priority")
-fixes: c589da20eb92 ("Setting highest autoconnect priority for network-scripts")
-
-Signed-off-by: Ani Sinha <anisinha@redhat.com>
-(cherry picked from commit 8a2fcbbcfdfc1df6f6c18f96588154f40083a239)
-(cherry picked from commit 67e8d963161e5487b1bfcd775fde9f957d6488ea)
-Signed-off-by: Cathy Avery <cavery@redhat.com>
----
- cloudinit/net/sysconfig.py                    |  1 +
- tests/unittests/cmd/devel/test_net_convert.py |  1 +
- tests/unittests/distros/test_netconfig.py     |  8 +++
- tests/unittests/net/network_configs.py        | 57 +++++++++++++++++++
- tests/unittests/test_net.py                   | 18 ++++++
- 5 files changed, 85 insertions(+)
-
-diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
-index d75012d26..2151db3ab 100644
---- a/cloudinit/net/sysconfig.py
-+++ b/cloudinit/net/sysconfig.py
-@@ -318,6 +318,7 @@ class Renderer(renderer.Renderer):
-             "ONBOOT": True,
-             "USERCTL": False,
-             "BOOTPROTO": "none",
-+            "AUTOCONNECT_PRIORITY": 120,
-         },
-         "suse": {"BOOTPROTO": "static", "STARTMODE": "auto"},
-     }
-diff --git a/tests/unittests/cmd/devel/test_net_convert.py b/tests/unittests/cmd/devel/test_net_convert.py
-index 39e049227..ed970e413 100644
---- a/tests/unittests/cmd/devel/test_net_convert.py
-+++ b/tests/unittests/cmd/devel/test_net_convert.py
-@@ -60,6 +60,7 @@ DHCP=ipv4
- SAMPLE_SYSCONFIG_CONTENT = """\
- # Created by cloud-init automatically, do not edit.
- #
-+AUTOCONNECT_PRIORITY=120
- BOOTPROTO=dhcp
- DEVICE=eth0
- ONBOOT=yes
-diff --git a/tests/unittests/distros/test_netconfig.py b/tests/unittests/distros/test_netconfig.py
-index b447757be..3768623f2 100644
---- a/tests/unittests/distros/test_netconfig.py
-+++ b/tests/unittests/distros/test_netconfig.py
-@@ -711,6 +711,7 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
-         expected_cfgs = {
-             self.ifcfg_path("eth0"): dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 DEFROUTE=yes
-                 DEVICE=eth0
-@@ -724,6 +725,7 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
-             ),
-             self.ifcfg_path("eth1"): dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=dhcp
-                 DEVICE=eth1
-                 ONBOOT=yes
-@@ -748,6 +750,7 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
-         expected_cfgs = {
-             self.ifcfg_path("eth0"): dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 DEFROUTE=yes
-                 DEVICE=eth0
-@@ -763,6 +766,7 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
-             ),
-             self.ifcfg_path("eth1"): dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=dhcp
-                 DEVICE=eth1
-                 ONBOOT=yes
-@@ -806,6 +810,7 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
-         expected_cfgs = {
-             self.ifcfg_path("eth0"): dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 DEVICE=eth0
-                 HWADDR=00:16:3e:60:7c:df
-@@ -818,6 +823,7 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
-             ),
-             self.ifcfg_path("infra0"): dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 DEVICE=infra0
-                 IPADDR=10.0.1.2
-@@ -853,6 +859,7 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
-         expected_cfgs = {
-             self.ifcfg_path("eth0"): dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 DEVICE=eth0
-                 IPADDR=192.10.1.2
-@@ -864,6 +871,7 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
-             ),
-             self.ifcfg_path("eth0.1001"): dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 DEVICE=eth0.1001
-                 IPADDR=10.0.1.2
-diff --git a/tests/unittests/net/network_configs.py b/tests/unittests/net/network_configs.py
-index 6e870f6ed..dd0bf73d2 100644
---- a/tests/unittests/net/network_configs.py
-+++ b/tests/unittests/net/network_configs.py
-@@ -184,6 +184,7 @@ NETWORK_CONFIGS = {
-         "expected_sysconfig_rhel": {
-             "ifcfg-eth1": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 DEVICE=eth1
-                 HWADDR=cf:d6:af:48:e8:80
-@@ -193,6 +194,7 @@ NETWORK_CONFIGS = {
-             ),
-             "ifcfg-eth99": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=dhcp
-                 DEFROUTE=yes
-                 DEVICE=eth99
-@@ -357,6 +359,7 @@ NETWORK_CONFIGS = {
-         "expected_sysconfig_rhel": {
-             "ifcfg-eth1": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 DEVICE=eth1
-                 HWADDR=cf:d6:af:48:e8:80
-@@ -366,6 +369,7 @@ NETWORK_CONFIGS = {
-             ),
-             "ifcfg-eth99": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=dhcp
-                 DEFROUTE=yes
-                 DEVICE=eth99
-@@ -622,6 +626,7 @@ NETWORK_CONFIGS = {
-         "expected_sysconfig_rhel": {
-             "ifcfg-iface0": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 DEVICE=iface0
-                 IPADDR=192.168.14.2
-@@ -738,6 +743,7 @@ NETWORK_CONFIGS = {
-         "expected_sysconfig_rhel": {
-             "ifcfg-iface0": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 DEVICE=iface0
-                 IPADDR=192.168.14.2
-@@ -893,6 +899,7 @@ NETWORK_CONFIGS = {
-         "expected_sysconfig_rhel": {
-             "ifcfg-iface0": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 DEVICE=iface0
-                 DHCPV6C=yes
-@@ -982,6 +989,7 @@ NETWORK_CONFIGS = {
-         "expected_sysconfig_rhel": {
-             "ifcfg-iface0": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 DEVICE=iface0
-                 DHCPV6C=yes
-@@ -1057,6 +1065,7 @@ NETWORK_CONFIGS = {
-         "expected_sysconfig_rhel": {
-             "ifcfg-iface0": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 DEVICE=iface0
-                 DHCPV6C=yes
-@@ -1123,6 +1132,7 @@ NETWORK_CONFIGS = {
-         "expected_sysconfig_rhel": {
-             "ifcfg-iface0": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 DEVICE=iface0
-                 IPV6_AUTOCONF=yes
-@@ -1188,6 +1198,7 @@ NETWORK_CONFIGS = {
-         "expected_sysconfig_rhel": {
-             "ifcfg-iface0": textwrap.dedent(
-                 """\
-+            AUTOCONNECT_PRIORITY=120
-             BOOTPROTO=none
-             DEVICE=iface0
-             IPV6ADDR=2001:1::1/64
-@@ -1246,6 +1257,7 @@ NETWORK_CONFIGS = {
-         "expected_sysconfig_rhel": {
-             "ifcfg-iface0": textwrap.dedent(
-                 """\
-+            AUTOCONNECT_PRIORITY=120
-             BOOTPROTO=none
-             DEVICE=iface0
-             DHCPV6C=yes
-@@ -1332,6 +1344,7 @@ NETWORK_CONFIGS = {
-         "expected_sysconfig_rhel": {
-             "ifcfg-iface0": textwrap.dedent(
-                 """\
-+            AUTOCONNECT_PRIORITY=120
-             BOOTPROTO=none
-             DEVICE=iface0
-             DHCPV6C=yes
-@@ -1378,6 +1391,7 @@ NETWORK_CONFIGS = {
-         "expected_sysconfig_rhel": {
-             "ifcfg-iface0": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=dhcp
-                 DEVICE=iface0
-                 ONBOOT=yes
-@@ -1453,6 +1467,7 @@ NETWORK_CONFIGS = {
-         "expected_sysconfig_rhel": {
-             "ifcfg-iface0": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=dhcp
-                 DEVICE=iface0
-                 ETHTOOL_OPTS="wol g"
-@@ -1788,6 +1803,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
-         "expected_sysconfig_rhel": {
-             "ifcfg-bond0": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BONDING_MASTER=yes
-                 BONDING_OPTS="mode=active-backup """
-                 """xmit_hash_policy=layer3+4 """
-@@ -1805,6 +1821,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
-             ),
-             "ifcfg-bond0.200": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=dhcp
-                 DEVICE=bond0.200
-                 DHCLIENT_SET_DEFAULT_ROUTE=no
-@@ -1816,6 +1833,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
-             "ifcfg-br0": textwrap.dedent(
-                 """\
-                 AGEING=250
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 DEFROUTE=yes
-                 DEVICE=br0
-@@ -1835,6 +1853,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
-             ),
-             "ifcfg-eth0": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 DEVICE=eth0
-                 HWADDR=c0:d6:9f:2c:e8:80
-@@ -1844,6 +1863,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
-             ),
-             "ifcfg-eth0.101": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 DEFROUTE=yes
-                 DEVICE=eth0.101
-@@ -1863,6 +1883,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
-             ),
-             "ifcfg-eth1": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 DEVICE=eth1
-                 HWADDR=aa:d6:9f:2c:e8:80
-@@ -1874,6 +1895,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
-             ),
-             "ifcfg-eth2": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 DEVICE=eth2
-                 HWADDR=c0:bb:9f:2c:e8:80
-@@ -1885,6 +1907,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
-             ),
-             "ifcfg-eth3": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 BRIDGE=br0
-                 DEVICE=eth3
-@@ -1895,6 +1918,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
-             ),
-             "ifcfg-eth4": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 BRIDGE=br0
-                 DEVICE=eth4
-@@ -1905,6 +1929,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
-             ),
-             "ifcfg-eth5": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=dhcp
-                 DEVICE=eth5
-                 DHCLIENT_SET_DEFAULT_ROUTE=no
-@@ -1915,6 +1940,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
-             ),
-             "ifcfg-ib0": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 DEVICE=ib0
-                 HWADDR=a0:00:02:20:fe:80:00:00:00:00:00:00:ec:0d:9a:03:00:15:e2:c1
-@@ -2575,6 +2601,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
-             ),
-             "ifcfg-eth0": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 DEVICE=eth0
-                 HWADDR=c0:d6:9f:2c:e8:80
-@@ -2584,6 +2611,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
-             ),
-             "ifcfg-eth0.101": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 DEFROUTE=yes
-                 DEVICE=eth0.101
-@@ -2603,6 +2631,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
-             ),
-             "ifcfg-eth1": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 DEVICE=eth1
-                 HWADDR=aa:d6:9f:2c:e8:80
-@@ -2614,6 +2643,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
-             ),
-             "ifcfg-eth2": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 DEVICE=eth2
-                 HWADDR=c0:bb:9f:2c:e8:80
-@@ -2625,6 +2655,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
-             ),
-             "ifcfg-eth3": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 BRIDGE=br0
-                 DEVICE=eth3
-@@ -2635,6 +2666,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
-             ),
-             "ifcfg-eth4": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 BRIDGE=br0
-                 DEVICE=eth4
-@@ -2645,6 +2677,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
-             ),
-             "ifcfg-eth5": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=dhcp
-                 DEVICE=eth5
-                 DHCLIENT_SET_DEFAULT_ROUTE=no
-@@ -2655,6 +2688,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
-             ),
-             "ifcfg-ib0": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 DEVICE=ib0
-                 HWADDR=a0:00:02:20:fe:80:00:00:00:00:00:00:ec:0d:9a:03:00:15:e2:c1
-@@ -3232,6 +3266,7 @@ iface bond0 inet6 static
-         "expected_sysconfig_rhel": {
-             "ifcfg-bond0": textwrap.dedent(
-                 """\
-+        AUTOCONNECT_PRIORITY=120
-         BONDING_MASTER=yes
-         BONDING_OPTS="mode=active-backup miimon=100 """
-                 """downdelay=10 updelay=20 primary=bond0s0"
-@@ -3258,6 +3293,7 @@ iface bond0 inet6 static
-             ),
-             "ifcfg-bond0s0": textwrap.dedent(
-                 """\
-+        AUTOCONNECT_PRIORITY=120
-         BOOTPROTO=none
-         DEVICE=bond0s0
-         HWADDR=aa:bb:cc:dd:e8:00
-@@ -3285,6 +3321,7 @@ iface bond0 inet6 static
-             ),
-             "ifcfg-bond0s1": textwrap.dedent(
-                 """\
-+        AUTOCONNECT_PRIORITY=120
-         BOOTPROTO=none
-         DEVICE=bond0s1
-         HWADDR=aa:bb:cc:dd:e8:01
-@@ -3585,6 +3622,7 @@ iface bond0 inet6 static
-         "expected_sysconfig_rhel": {
-             "ifcfg-bond0": textwrap.dedent(
-                 """\
-+        AUTOCONNECT_PRIORITY=120
-         BONDING_MASTER=yes
-         BONDING_OPTS="mode=active-backup xmit_hash_policy=layer3+4 """
-                 """miimon=100 num_grat_arp=5 """
-@@ -3615,6 +3653,7 @@ iface bond0 inet6 static
-             ),
-             "ifcfg-bond0s0": textwrap.dedent(
-                 """\
-+        AUTOCONNECT_PRIORITY=120
-         BOOTPROTO=none
-         DEVICE=bond0s0
-         HWADDR=aa:bb:cc:dd:e8:00
-@@ -3642,6 +3681,7 @@ iface bond0 inet6 static
-             ),
-             "ifcfg-bond0s1": textwrap.dedent(
-                 """\
-+        AUTOCONNECT_PRIORITY=120
-         BOOTPROTO=none
-         DEVICE=bond0s1
-         HWADDR=aa:bb:cc:dd:e8:01
-@@ -3789,6 +3829,7 @@ iface bond0 inet6 static
-         "expected_sysconfig_rhel": {
-             "ifcfg-en0": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 DEVICE=en0
-                 HWADDR=aa:bb:cc:dd:e8:00
-@@ -3798,6 +3839,7 @@ iface bond0 inet6 static
-             ),
-             "ifcfg-en0.99": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 DEFROUTE=yes
-                 DEVICE=en0.99
-@@ -3924,6 +3966,7 @@ iface bond0 inet6 static
-         "expected_sysconfig_rhel": {
-             "ifcfg-en0": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 DEVICE=en0
-                 HWADDR=aa:bb:cc:dd:e8:00
-@@ -3933,6 +3976,7 @@ iface bond0 inet6 static
-             ),
-             "ifcfg-en0.99": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 DEFROUTE=yes
-                 DEVICE=en0.99
-@@ -4098,6 +4142,7 @@ iface bond0 inet6 static
-         "expected_sysconfig_rhel": {
-             "ifcfg-br0": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 DEVICE=br0
-                 IPADDR=192.168.2.2
-@@ -4111,6 +4156,7 @@ iface bond0 inet6 static
-             ),
-             "ifcfg-eth0": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 BRIDGE=br0
-                 DEVICE=eth0
-@@ -4126,6 +4172,7 @@ iface bond0 inet6 static
-             ),
-             "ifcfg-eth1": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 BRIDGE=br0
-                 DEVICE=eth1
-@@ -4313,6 +4360,7 @@ iface bond0 inet6 static
-         "expected_sysconfig_rhel": {
-             "ifcfg-eth0": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 DEVICE=eth0
-                 HWADDR=52:54:00:12:34:00
-@@ -4325,6 +4373,7 @@ iface bond0 inet6 static
-             ),
-             "ifcfg-eth1": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 DEVICE=eth1
-                 HWADDR=52:54:00:12:34:aa
-@@ -4336,6 +4385,7 @@ iface bond0 inet6 static
-             ),
-             "ifcfg-eth2": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 DEVICE=eth2
-                 HWADDR=52:54:00:12:34:ff
-@@ -4505,6 +4555,7 @@ iface bond0 inet6 static
-                 """\
-                 # Created by cloud-init automatically, do not edit.
-                 #
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 DEFROUTE=yes
-                 DEVICE=interface0
-@@ -4583,6 +4634,7 @@ iface bond0 inet6 static
-         "expected_sysconfig_rhel": {
-             "ifcfg-eth0": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 DEVICE=eth0
-                 HWADDR=cf:d6:af:48:e8:80
-@@ -4734,6 +4786,7 @@ iface bond0 inet6 static
-                 """\
-                 # Created by cloud-init automatically, do not edit.
-                 #
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 DEVICE=eth0
-                 DNS1=8.8.8.8
-@@ -4945,6 +4998,7 @@ iface bond0 inet6 static
-                 """\
-                 # Created by cloud-init automatically, do not edit.
-                 #
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 DEVICE=baremetal
-                 IPV6ADDR=fc00:1:1::2/64
-@@ -4960,6 +5014,7 @@ iface bond0 inet6 static
-                 """\
-                 # Created by cloud-init automatically, do not edit.
-                 #
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 BRIDGE=baremetal
-                 DEVICE=baremetal0
-@@ -4973,6 +5028,7 @@ iface bond0 inet6 static
-                 """\
-                 # Created by cloud-init automatically, do not edit.
-                 #
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 DEVICE=provisioning
-                 IPV6ADDR=fc00:1:2::2/64
-@@ -4988,6 +5044,7 @@ iface bond0 inet6 static
-                 """\
-                 # Created by cloud-init automatically, do not edit.
-                 #
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 BRIDGE=provisioning
-                 DEVICE=provisioning0
-diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
-index 531302f70..d95ee2979 100644
---- a/tests/unittests/test_net.py
-+++ b/tests/unittests/test_net.py
-@@ -612,6 +612,7 @@ dns = none
-                 """
- # Created by cloud-init automatically, do not edit.
- #
-+AUTOCONNECT_PRIORITY=120
- BOOTPROTO=none
- DEFROUTE=yes
- DEVICE=eth0
-@@ -777,6 +778,7 @@ dns = none
-                 """
- # Created by cloud-init automatically, do not edit.
- #
-+AUTOCONNECT_PRIORITY=120
- BOOTPROTO=none
- DEFROUTE=yes
- DEVICE=eth0
-@@ -951,6 +953,7 @@ dns = none
-                 """
- # Created by cloud-init automatically, do not edit.
- #
-+AUTOCONNECT_PRIORITY=120
- BOOTPROTO=none
- DEFROUTE=yes
- DEVICE=eth0
-@@ -1074,6 +1077,7 @@ dns = none
-                 """
- # Created by cloud-init automatically, do not edit.
- #
-+AUTOCONNECT_PRIORITY=120
- BOOTPROTO=none
- DEFROUTE=yes
- DEVICE=eth0
-@@ -1266,6 +1270,7 @@ dns = none
-                 """
- # Created by cloud-init automatically, do not edit.
- #
-+AUTOCONNECT_PRIORITY=120
- BOOTPROTO=none
- DEFROUTE=yes
- DEVICE=eth0
-@@ -1934,6 +1939,7 @@ class TestRhelSysConfigRendering:
-             expected_content = """
- # Created by cloud-init automatically, do not edit.
- #
-+AUTOCONNECT_PRIORITY=120
- BOOTPROTO=dhcp
- DEVICE=eth1000
- DHCPV6C=yes
-@@ -2143,6 +2149,7 @@ USERCTL=no
-         expected = """\
- # Created by cloud-init automatically, do not edit.
- #
-+AUTOCONNECT_PRIORITY=120
- BOOTPROTO=none
- DEFROUTE=yes
- DEVICE=interface0
-@@ -2172,6 +2179,7 @@ USERCTL=no
-         expected_i1 = """\
- # Created by cloud-init automatically, do not edit.
- #
-+AUTOCONNECT_PRIORITY=120
- BOOTPROTO=none
- DEFROUTE=yes
- DEVICE=eth0
-@@ -2188,6 +2196,7 @@ USERCTL=no
-         expected_i2 = """\
- # Created by cloud-init automatically, do not edit.
- #
-+AUTOCONNECT_PRIORITY=120
- BOOTPROTO=dhcp
- DEVICE=eth1
- DHCLIENT_SET_DEFAULT_ROUTE=no
-@@ -2215,6 +2224,7 @@ USERCTL=no
-         expected = """\
- # Created by cloud-init automatically, do not edit.
- #
-+AUTOCONNECT_PRIORITY=120
- BOOTPROTO=dhcp
- DEVICE=eth0
- ONBOOT=yes
-@@ -2396,6 +2406,7 @@ USERCTL=no
-             "expected_sysconfig": {
-                 "ifcfg-ens3": textwrap.dedent(
-                     """\
-+                   AUTOCONNECT_PRIORITY=120
-                    BOOTPROTO=none
-                    DEFROUTE=yes
-                    DEVICE=ens3
-@@ -2442,6 +2453,7 @@ USERCTL=no
-         expected = {
-             "ifcfg-eno1": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 DEVICE=eno1
-                 ONBOOT=yes
-@@ -2451,6 +2463,7 @@ USERCTL=no
-             ),
-             "ifcfg-eno1.1000": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 DEVICE=eno1.1000
-                 IPADDR=192.6.1.9
-@@ -2483,6 +2496,7 @@ USERCTL=no
-         expected = {
-             "ifcfg-bond0": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BONDING_MASTER=yes
-                 BONDING_SLAVE0=enp0s0
-                 BONDING_SLAVE1=enp0s1
-@@ -2498,6 +2512,7 @@ USERCTL=no
-             ),
-             "ifcfg-enp0s0": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BONDING_MASTER=yes
-                 BOOTPROTO=none
-                 DEVICE=enp0s0
-@@ -2510,6 +2525,7 @@ USERCTL=no
-             ),
-             "ifcfg-enp0s1": textwrap.dedent(
-                 """\
-+                AUTOCONNECT_PRIORITY=120
-                 BONDING_MASTER=yes
-                 BOOTPROTO=none
-                 DEVICE=enp0s1
-@@ -2541,6 +2557,7 @@ USERCTL=no
-             expected = {
-                 "ifcfg-eno1": textwrap.dedent(
-                     """\
-+                    AUTOCONNECT_PRIORITY=120
-                     BOOTPROTO=dhcp
-                     DEVICE=eno1
-                     HWADDR=07-1c-c6-75-a4-be
-@@ -2621,6 +2638,7 @@ USERCTL=no
-                 """\
-                 # Created by cloud-init automatically, do not edit.
-                 #
-+                AUTOCONNECT_PRIORITY=120
-                 BOOTPROTO=none
-                 DEFROUTE=yes
-                 DEVICE=eth0

0003-downstream-cc_disk_setup-add-sgdisk-to-sfdisk-conver.patch

@@ -1,417 +0,0 @@
-From d4f05a45664111bfb2b83b68acd855278cd025f5 Mon Sep 17 00:00:00 2001
-From: Vitaly Kuznetsov <vkuznets@redhat.com>
-Date: Wed, 7 Aug 2024 16:43:55 +0200
-Subject: [PATCH] downstream: cc_disk_setup: add sgdisk to sfdisk convertion
- dictionaries
-
-RH-Author: Vitaly Kuznetsov <vkuznets@redhat.com>
-RH-MergeRequest: 106: Get rid of gdisk dependency
-RH-Jira: RHEL-36093
-RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-RH-Acked-by: Cathy Avery <cavery@redhat.com>
-RH-Commit: [1/2] c6a6eca2b1496bccfe404e902417f02f828682aa (vkuznets/cloud-init)
-
-In preparation to using sfdisk instead of sgdisk, make it possible to
-convert between sgdisk-invented ids and standard GPT UUIDs.
-
-No functional change.
-
-X-downstream-only: true
-
-Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
-
-Patch-name: ci-cc_disk_setup-add-sgdisk-to-sfdisk-convertion-dictio.patch
-Patch-id: 22
-Patch-present-in-specfile: True
-(cherry picked from commit 756170f8bd98f3769640553a70e590343f49cb4b)
-Signed-off-by: Cathy Avery <cavery@redhat.com>
----
- cloudinit/config/cc_disk_setup.py | 375 ++++++++++++++++++++++++++++++
- 1 file changed, 375 insertions(+)
-
-diff --git a/cloudinit/config/cc_disk_setup.py b/cloudinit/config/cc_disk_setup.py
-index 0864140c5..f297d068e 100644
---- a/cloudinit/config/cc_disk_setup.py
-+++ b/cloudinit/config/cc_disk_setup.py
-@@ -396,6 +396,381 @@ def check_partition_mbr_layout(device, layout):
-     return found_layout
- 
- 
-+SFDISK_CMD = "sfdisk"
-+
-+# gdisk uses its own invented ids, convert them to standard GPT ones.
-+# From gdisk sources:
-+# grep " AddType" parttypes.cc | \
-+# sed -e 's,AddType(,,' -e 's,"\,.*$,"\,,' -e 's,0x,",' -e 's,\,,":,' | \
-+# tr "[a-z]" "[A-Z]"
-+sgdisk_to_gpt_id = {
-+    "0000": "00000000-0000-0000-0000-000000000000",
-+    "0100": "EBD0A0A2-B9E5-4433-87C0-68B6B72699C7",
-+    "0400": "EBD0A0A2-B9E5-4433-87C0-68B6B72699C7",
-+    "0600": "EBD0A0A2-B9E5-4433-87C0-68B6B72699C7",
-+    "0700": "EBD0A0A2-B9E5-4433-87C0-68B6B72699C7",
-+    "0701": "558D43C5-A1AC-43C0-AAC8-D1472B2923D1",
-+    "0702": "90B6FF38-B98F-4358-A21F-48F35B4A8AD3",
-+    "0B00": "EBD0A0A2-B9E5-4433-87C0-68B6B72699C7",
-+    "0C00": "EBD0A0A2-B9E5-4433-87C0-68B6B72699C7",
-+    "0C01": "E3C9E316-0B5C-4DB8-817D-F92DF00215AE",
-+    "0E00": "EBD0A0A2-B9E5-4433-87C0-68B6B72699C7",
-+    "1100": "EBD0A0A2-B9E5-4433-87C0-68B6B72699C7",
-+    "1400": "EBD0A0A2-B9E5-4433-87C0-68B6B72699C7",
-+    "1600": "EBD0A0A2-B9E5-4433-87C0-68B6B72699C7",
-+    "1700": "EBD0A0A2-B9E5-4433-87C0-68B6B72699C7",
-+    "1B00": "EBD0A0A2-B9E5-4433-87C0-68B6B72699C7",
-+    "1C00": "EBD0A0A2-B9E5-4433-87C0-68B6B72699C7",
-+    "1E00": "EBD0A0A2-B9E5-4433-87C0-68B6B72699C7",
-+    "2700": "DE94BBA4-06D1-4D40-A16A-BFD50179D6AC",
-+    "3000": "7412F7D5-A156-4B13-81DC-867174929325",
-+    "3001": "D4E6E2CD-4469-46F3-B5CB-1BFF57AFC149",
-+    "3900": "C91818F9-8025-47AF-89D2-F030D7000C2C",
-+    "4100": "9E1A2D38-C612-4316-AA26-8B49521E5A8B",
-+    "4200": "AF9B60A0-1431-4F62-BC68-3311714A69AD",
-+    "4201": "5808C8AA-7E8F-42E0-85D2-E1E90434CFB3",
-+    "4202": "E75CAF8F-F680-4CEE-AFA3-B001E56EFC2D",
-+    "7501": "37AFFC90-EF7D-4E96-91C3-2D7AE055B174",
-+    "7F00": "FE3A2A5D-4F32-41A7-B725-ACCC3285A309",
-+    "7F01": "3CB8E202-3B7E-47DD-8A3C-7FF2A13CFCEC",
-+    "7F02": "2E0A753D-9E48-43B0-8337-B15192CB1B5E",
-+    "7F03": "CAB6E88E-ABF3-4102-A07A-D4BB9BE3C1D3",
-+    "7F04": "09845860-705F-4BB5-B16C-8A8A099CAF52",
-+    "7F05": "3F0F8318-F146-4E6B-8222-C28C8F02E0D5",
-+    "8200": "0657FD6D-A4AB-43C4-84E5-0933C84B4F4F",
-+    "8300": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
-+    "8301": "8DA63339-0007-60C0-C436-083AC8230908",
-+    "8302": "933AC7E1-2EB4-4F13-B844-0E14E2AEF915",
-+    "8303": "44479540-F297-41B2-9AF7-D131D5F0458A",
-+    "8304": "4F68BCE3-E8CD-4DB1-96E7-FBCAF984B709",
-+    "8305": "B921B045-1DF0-41C3-AF44-4C6F280D3FAE",
-+    "8306": "3B8F8425-20E0-4F3B-907F-1A25A76F98E8",
-+    "8307": "69DAD710-2CE4-4E3C-B16C-21A1D49ABED3",
-+    "8308": "7FFEC5C9-2D00-49B7-8941-3EA10A5586B7",
-+    "8309": "CA7D7CCB-63ED-4C53-861C-1742536059CC",
-+    "830A": "993D8D3D-F80E-4225-855A-9DAF8ED7EA97",
-+    "830B": "D13C5D3B-B5D1-422A-B29F-9454FDC89D76",
-+    "830C": "2C7357ED-EBD2-46D9-AEC1-23D437EC2BF5",
-+    "830D": "7386CDF2-203C-47A9-A498-F2ECCE45A2D6",
-+    "830E": "DF3300CE-D69F-4C92-978C-9BFB0F38D820",
-+    "830F": "86ED10D5-B607-45BB-8957-D350F23D0571",
-+    "8310": "4D21B016-B534-45C2-A9FB-5C16E091FD2D",
-+    "8311": "7EC6F557-3BC5-4ACA-B293-16EF5DF639D1",
-+    "8312": "773F91EF-66D4-49B5-BD83-D683BF40AD16",
-+    "8313": "75250D76-8CC6-458E-BD66-BD47CC81A812",
-+    "8314": "8484680C-9521-48C6-9C11-B0720656F69E",
-+    "8315": "7D0359A3-02B3-4F0A-865C-654403E70625",
-+    "8316": "B0E01050-EE5F-4390-949A-9101B17104E9",
-+    "8317": "4301D2A6-4E3B-4B2A-BB94-9E0B2C4225EA",
-+    "8318": "8F461B0D-14EE-4E81-9AA9-049B6FB97ABD",
-+    "8319": "77FF5F63-E7B6-4633-ACF4-1565B864C0E6",
-+    "831A": "C215D751-7BCD-4649-BE90-6627490A4C05",
-+    "831B": "6E11A4E7-FBCA-4DED-B9E9-E1A512BB664E",
-+    "831C": "6A491E03-3BE7-4545-8E38-83320E0EA880",
-+    "831D": "6523F8AE-3EB1-4E2A-A05A-18B695AE656F",
-+    "831E": "D27F46ED-2919-4CB8-BD25-9531F3C16534",
-+    "831F": "77055800-792C-4F94-B39A-98C91B762BB6",
-+    "8320": "E9434544-6E2C-47CC-BAE2-12D6DEAFB44C",
-+    "8321": "D113AF76-80EF-41B4-BDB6-0CFF4D3D4A25",
-+    "8322": "37C58C8A-D913-4156-A25F-48B1B64E07F0",
-+    "8323": "700BDA43-7A34-4507-B179-EEB93D7A7CA3",
-+    "8324": "1AACDB3B-5444-4138-BD9E-E5C2239B2346",
-+    "8325": "1DE3F1EF-FA98-47B5-8DCD-4A860A654D78",
-+    "8326": "912ADE1D-A839-4913-8964-A10EEE08FBD2",
-+    "8327": "C31C45E6-3F39-412E-80FB-4809C4980599",
-+    "8328": "60D5A7FE-8E7D-435C-B714-3DD8162144E1",
-+    "8329": "72EC70A6-CF74-40E6-BD49-4BDA08E8F224",
-+    "832A": "08A7ACEA-624C-4A20-91E8-6E0FA67D23F9",
-+    "832B": "5EEAD9A9-FE09-4A1E-A1D7-520D00531306",
-+    "832C": "C50CDD70-3862-4CC3-90E1-809A8C93EE2C",
-+    "832D": "E18CF08C-33EC-4C0D-8246-C6C6FB3DA024",
-+    "832E": "7978A683-6316-4922-BBEE-38BFF5A2FECC",
-+    "832F": "E611C702-575C-4CBE-9A46-434FA0BF7E3F",
-+    "8330": "773B2ABC-2A99-4398-8BF5-03BAAC40D02B",
-+    "8331": "57E13958-7331-4365-8E6E-35EEEE17C61B",
-+    "8332": "0F4868E9-9952-4706-979F-3ED3A473E947",
-+    "8333": "C97C1F32-BA06-40B4-9F22-236061B08AA8",
-+    "8334": "DC4A4480-6917-4262-A4EC-DB9384949F25",
-+    "8335": "7D14FEC5-CC71-415D-9D6C-06BF0B3C3EAF",
-+    "8336": "2C9739E2-F068-46B3-9FD0-01C5A9AFBCCA",
-+    "8337": "15BB03AF-77E7-4D4A-B12B-C0D084F7491C",
-+    "8338": "B933FB22-5C3F-4F91-AF90-E2BB0FA50702",
-+    "8339": "BEAEC34B-8442-439B-A40B-984381ED097D",
-+    "833A": "CD0F869B-D0FB-4CA0-B141-9EA87CC78D66",
-+    "833B": "8A4F5770-50AA-4ED3-874A-99B710DB6FEA",
-+    "833C": "55497029-C7C1-44CC-AA39-815ED1558630",
-+    "833D": "FC56D9E9-E6E5-4C06-BE32-E74407CE09A5",
-+    "833E": "24B2D975-0F97-4521-AFA1-CD531E421B8D",
-+    "833F": "F3393B22-E9AF-4613-A948-9D3BFBD0C535",
-+    "8340": "7A430799-F711-4C7E-8E5B-1D685BD48607",
-+    "8341": "579536F8-6A33-4055-A95A-DF2D5E2C42A8",
-+    "8342": "D7D150D2-2A04-4A33-8F12-16651205FF7B",
-+    "8343": "16B417F8-3E06-4F57-8DD2-9B5232F41AA6",
-+    "8344": "D212A430-FBC5-49F9-A983-A7FEEF2B8D0E",
-+    "8345": "906BD944-4589-4AAE-A4E4-DD983917446A",
-+    "8346": "9225A9A3-3C19-4D89-B4F6-EEFF88F17631",
-+    "8347": "98CFE649-1588-46DC-B2F0-ADD147424925",
-+    "8348": "AE0253BE-1167-4007-AC68-43926C14C5DE",
-+    "8349": "B6ED5582-440B-4209-B8DA-5FF7C419EA3D",
-+    "834A": "7AC63B47-B25C-463B-8DF8-B4A94E6C90E1",
-+    "834B": "B325BFBE-C7BE-4AB8-8357-139E652D2F6B",
-+    "834C": "966061EC-28E4-4B2E-B4A5-1F0A825A1D84",
-+    "834D": "8CCE0D25-C0D0-4A44-BD87-46331BF1DF67",
-+    "834E": "FCA0598C-D880-4591-8C16-4EDA05C7347C",
-+    "834F": "F46B2C26-59AE-48F0-9106-C50ED47F673D",
-+    "8350": "6E5A1BC8-D223-49B7-BCA8-37A5FCCEB996",
-+    "8351": "81CF9D90-7458-4DF4-8DCF-C8A3A404F09B",
-+    "8352": "46B98D8D-B55C-4E8F-AAB3-37FCA7F80752",
-+    "8353": "3C3D61FE-B5F3-414D-BB71-8739A694A4EF",
-+    "8354": "5843D618-EC37-48D7-9F12-CEA8E08768B2",
-+    "8355": "EE2B9983-21E8-4153-86D9-B6901A54D1CE",
-+    "8356": "BDB528A5-A259-475F-A87D-DA53FA736A07",
-+    "8357": "DF765D00-270E-49E5-BC75-F47BB2118B09",
-+    "8358": "CB1EE4E3-8CD0-4136-A0A4-AA61A32E8730",
-+    "8359": "8F1056BE-9B05-47C4-81D6-BE53128E5B54",
-+    "835A": "B663C618-E7BC-4D6D-90AA-11B756BB1797",
-+    "835B": "31741CC4-1A2A-4111-A581-E00B447D2D06",
-+    "835C": "2FB4BF56-07FA-42DA-8132-6B139F2026AE",
-+    "835D": "D46495B7-A053-414F-80F7-700C99921EF8",
-+    "835E": "143A70BA-CBD3-4F06-919F-6C05683A78BC",
-+    "835F": "42B0455F-EB11-491D-98D3-56145BA9D037",
-+    "8360": "6DB69DE6-29F4-4758-A7A5-962190F00CE3",
-+    "8361": "E98B36EE-32BA-4882-9B12-0CE14655F46A",
-+    "8362": "5AFB67EB-ECC8-4F85-AE8E-AC1E7C50E7D0",
-+    "8363": "BBA210A2-9C5D-45EE-9E87-FF2CCBD002D0",
-+    "8364": "43CE94D4-0F3D-4999-8250-B9DEAFD98E6E",
-+    "8365": "C919CC1F-4456-4EFF-918C-F75E94525CA5",
-+    "8366": "904E58EF-5C65-4A31-9C57-6AF5FC7C5DE7",
-+    "8367": "15DE6170-65D3-431C-916E-B0DCD8393F25",
-+    "8368": "D4A236E7-E873-4C07-BF1D-BF6CF7F1C3C6",
-+    "8369": "F5E2C20C-45B2-4FFA-BCE9-2A60737E1AAF",
-+    "836A": "1B31B5AA-ADD9-463A-B2ED-BD467FC857E7",
-+    "836B": "3A112A75-8729-4380-B4CF-764D79934448",
-+    "836C": "EFE0F087-EA8D-4469-821A-4C2A96A8386A",
-+    "836D": "3482388E-4254-435A-A241-766A065F9960",
-+    "836E": "C80187A5-73A3-491A-901A-017C3FA953E9",
-+    "836F": "B3671439-97B0-4A53-90F7-2D5A8F3AD47B",
-+    "8370": "41092B05-9FC8-4523-994F-2DEF0408B176",
-+    "8371": "5996FC05-109C-48DE-808B-23FA0830B676",
-+    "8372": "5C6E1C76-076A-457A-A0FE-F3B4CD21CE6E",
-+    "8373": "94F9A9A1-9971-427A-A400-50CB297F0F35",
-+    "8374": "D7FF812F-37D1-4902-A810-D76BA57B975A",
-+    "8375": "C23CE4FF-44BD-4B00-B2D4-B41B3419E02A",
-+    "8376": "8DE58BC2-2A43-460D-B14E-A76E4A17B47F",
-+    "8377": "B024F315-D330-444C-8461-44BBDE524E99",
-+    "8378": "97AE158D-F216-497B-8057-F7F905770F54",
-+    "8379": "05816CE2-DD40-4AC6-A61D-37D32DC1BA7D",
-+    "837A": "3E23CA0B-A4BC-4B4E-8087-5AB6A26AA8A9",
-+    "837B": "F2C2C7EE-ADCC-4351-B5C6-EE9816B66E16",
-+    "837C": "450DD7D1-3224-45EC-9CF2-A43A346D71EE",
-+    "837D": "C8BFBD1E-268E-4521-8BBA-BF314C399557",
-+    "837E": "0B888863-D7F8-4D9E-9766-239FCE4D58AF",
-+    "837F": "7007891D-D371-4A80-86A4-5CB875B9302E",
-+    "8380": "C3836A13-3137-45BA-B583-B16C50FE5EB4",
-+    "8381": "D2F9000A-7A18-453F-B5CD-4D32F77A7B32",
-+    "8382": "17440E4F-A8D0-467F-A46E-3912AE6EF2C5",
-+    "8383": "3F324816-667B-46AE-86EE-9B0C0C6C11B4",
-+    "8384": "4EDE75E2-6CCC-4CC8-B9C7-70334B087510",
-+    "8385": "E7BB33FB-06CF-4E81-8273-E543B413E2E2",
-+    "8386": "974A71C0-DE41-43C3-BE5D-5C5CCD1AD2C0",
-+    "8400": "D3BFE2DE-3DAF-11DF-BA40-E3A556D89593",
-+    "8401": "7C5222BD-8F5D-4087-9C00-BF9843C7B58C",
-+    "8500": "5DFBF5F4-2848-4BAC-AA5E-0D9A20B745A6",
-+    "8501": "3884DD41-8582-4404-B9A8-E9B84F2DF50E",
-+    "8502": "C95DC21A-DF0E-4340-8D7B-26CBFA9A03E0",
-+    "8503": "BE9067B9-EA49-4F15-B4F6-F36F8C9E1818",
-+    "8E00": "E6D6D379-F507-44C2-A23C-238F2A3DF928",
-+    "A000": "2568845D-2332-4675-BC39-8FA5A4748D15",
-+    "A001": "114EAFFE-1552-4022-B26E-9B053604CF84",
-+    "A002": "49A4D17F-93A3-45C1-A0DE-F50B2EBE2599",
-+    "A003": "4177C722-9E92-4AAB-8644-43502BFD5506",
-+    "A004": "EF32A33B-A409-486C-9141-9FFB711F6266",
-+    "A005": "20AC26BE-20B7-11E3-84C5-6CFDB94711E9",
-+    "A006": "38F428E6-D326-425D-9140-6E0EA133647C",
-+    "A007": "A893EF21-E428-470A-9E55-0668FD91A2D9",
-+    "A008": "DC76DDA9-5AC1-491C-AF42-A82591580C0D",
-+    "A009": "EBC597D0-2053-4B15-8B64-E0AAC75F4DB1",
-+    "A00A": "8F68CC74-C5E5-48DA-BE91-A0C8C15E9C80",
-+    "A00B": "767941D0-2085-11E3-AD3B-6CFDB94711E9",
-+    "A00C": "AC6D7924-EB71-4DF8-B48D-E267B27148FF",
-+    "A00D": "C5A0AEEC-13EA-11E5-A1B1-001E67CA0C3C",
-+    "A00E": "BD59408B-4514-490D-BF12-9878D963F378",
-+    "A00F": "9FDAA6EF-4B3F-40D2-BA8D-BFF16BFB887B",
-+    "A010": "19A710A2-B3CA-11E4-B026-10604B889DCF",
-+    "A011": "193D1EA4-B3CA-11E4-B075-10604B889DCF",
-+    "A012": "DEA0BA2C-CBDD-4805-B4F9-F428251C3E98",
-+    "A013": "8C6B52AD-8A9E-4398-AD09-AE916E53AE2D",
-+    "A014": "05E044DF-92F1-4325-B69E-374A82E97D6E",
-+    "A015": "400FFDCD-22E0-47E7-9A23-F16ED9382388",
-+    "A016": "A053AA7F-40B8-4B1C-BA08-2F68AC71A4F4",
-+    "A017": "E1A6A689-0C8D-4CC6-B4E8-55A4320FBD8A",
-+    "A018": "098DF793-D712-413D-9D4E-89D711772228",
-+    "A019": "D4E0D938-B7FA-48C1-9D21-BC5ED5C4B203",
-+    "A01A": "20A0C19C-286A-42FA-9CE7-F64C3226A794",
-+    "A01B": "A19F205F-CCD8-4B6D-8F1E-2D9BC24CFFB1",
-+    "A01C": "66C9B323-F7FC-48B6-BF96-6F32E335A428",
-+    "A01D": "303E6AC3-AF15-4C54-9E9B-D9A8FBECF401",
-+    "A01E": "C00EEF24-7709-43D6-9799-DD2B411E7A3C",
-+    "A01F": "82ACC91F-357C-4A68-9C8F-689E1B1A23A1",
-+    "A020": "E2802D54-0545-E8A1-A1E8-C7A3E245ACD4",
-+    "A021": "65ADDCF4-0C5C-4D9A-AC2D-D90B5CBFCD03",
-+    "A022": "E6E98DA2-E22A-4D12-AB33-169E7DEAA507",
-+    "A023": "ED9E8101-05FA-46B7-82AA-8D58770D200B",
-+    "A024": "11406F35-1173-4869-807B-27DF71802812",
-+    "A025": "9D72D4E4-9958-42DA-AC26-BEA7A90B0434",
-+    "A026": "6C95E238-E343-4BA8-B489-8681ED22AD0B",
-+    "A027": "EBBEADAF-22C9-E33B-8F5D-0E81686A68CB",
-+    "A028": "0A288B1F-22C9-E33B-8F5D-0E81686A68CB",
-+    "A029": "57B90A16-22C9-E33B-8F5D-0E81686A68CB",
-+    "A02A": "638FF8E2-22C9-E33B-8F5D-0E81686A68CB",
-+    "A02B": "2013373E-1AC4-4131-BFD8-B6A7AC638772",
-+    "A02C": "2C86E742-745E-4FDD-BFD8-B6A7AC638772",
-+    "A02D": "DE7D4029-0F5B-41C8-AE7E-F6C023A02B33",
-+    "A02E": "323EF595-AF7A-4AFA-8060-97BE72841BB9",
-+    "A02F": "45864011-CF89-46E6-A445-85262E065604",
-+    "A030": "8ED8AE95-597F-4C8A-A5BD-A7FF8E4DFAA9",
-+    "A031": "DF24E5ED-8C96-4B86-B00B-79667DC6DE11",
-+    "A032": "7C29D3AD-78B9-452E-9DEB-D098D542F092",
-+    "A033": "379D107E-229E-499D-AD4F-61F5BCF87BD4",
-+    "A034": "0DEA65E5-A676-4CDF-823C-77568B577ED5",
-+    "A035": "4627AE27-CFEF-48A1-88FE-99C3509ADE26",
-+    "A036": "20117F86-E985-4357-B9EE-374BC1D8487D",
-+    "A037": "86A7CB80-84E1-408C-99AB-694F1A410FC7",
-+    "A038": "97D7B011-54DA-4835-B3C4-917AD6E73D74",
-+    "A039": "5594C694-C871-4B5F-90B1-690A6F68E0F7",
-+    "A03A": "1B81E7E6-F50D-419B-A739-2AEEF8DA3335",
-+    "A03B": "98523EC6-90FE-4C67-B50A-0FC59ED6F56D",
-+    "A03C": "2644BCC0-F36A-4792-9533-1738BED53EE3",
-+    "A03D": "DD7C91E9-38C9-45C5-8A12-4A80F7E14057",
-+    "A03E": "7696D5B6-43FD-4664-A228-C563C4A1E8CC",
-+    "A03F": "0D802D54-058D-4A20-AD2D-C7A362CEACD4",
-+    "A040": "10A0C19C-516A-5444-5CE3-664C3226A794",
-+    "A200": "734E5AFE-F61A-11E6-BC64-92361F002671",
-+    "A500": "516E7CB4-6ECF-11D6-8FF8-00022D09712B",
-+    "A501": "83BD6B9D-7F41-11DC-BE0B-001560B84F0F",
-+    "A502": "516E7CB5-6ECF-11D6-8FF8-00022D09712B",
-+    "A503": "516E7CB6-6ECF-11D6-8FF8-00022D09712B",
-+    "A504": "516E7CBA-6ECF-11D6-8FF8-00022D09712B",
-+    "A505": "516E7CB8-6ECF-11D6-8FF8-00022D09712B",
-+    "A506": "74BA7DD9-A689-11E1-BD04-00E081286ACF",
-+    "A580": "85D5E45A-237C-11E1-B4B3-E89A8F7FC3A7",
-+    "A581": "85D5E45E-237C-11E1-B4B3-E89A8F7FC3A7",
-+    "A582": "85D5E45B-237C-11E1-B4B3-E89A8F7FC3A7",
-+    "A583": "0394EF8B-237E-11E1-B4B3-E89A8F7FC3A7",
-+    "A584": "85D5E45D-237C-11E1-B4B3-E89A8F7FC3A7",
-+    "A585": "85D5E45C-237C-11E1-B4B3-E89A8F7FC3A7",
-+    "A600": "824CC7A0-36A8-11E3-890A-952519AD3F61",
-+    "A800": "55465300-0000-11AA-AA11-00306543ECAC",
-+    "A900": "516E7CB4-6ECF-11D6-8FF8-00022D09712B",
-+    "A901": "49F48D32-B10E-11DC-B99B-0019D1879648",
-+    "A902": "49F48D5A-B10E-11DC-B99B-0019D1879648",
-+    "A903": "49F48D82-B10E-11DC-B99B-0019D1879648",
-+    "A904": "2DB519C4-B10F-11DC-B99B-0019D1879648",
-+    "A905": "2DB519EC-B10F-11DC-B99B-0019D1879648",
-+    "A906": "49F48DAA-B10E-11DC-B99B-0019D1879648",
-+    "AB00": "426F6F74-0000-11AA-AA11-00306543ECAC",
-+    "AF00": "48465300-0000-11AA-AA11-00306543ECAC",
-+    "AF01": "52414944-0000-11AA-AA11-00306543ECAC",
-+    "AF02": "52414944-5F4F-11AA-AA11-00306543ECAC",
-+    "AF03": "4C616265-6C00-11AA-AA11-00306543ECAC",
-+    "AF04": "5265636F-7665-11AA-AA11-00306543ECAC",
-+    "AF05": "53746F72-6167-11AA-AA11-00306543ECAC",
-+    "AF06": "B6FA30DA-92D2-4A9A-96F1-871EC6486200",
-+    "AF07": "2E313465-19B9-463F-8126-8A7993773801",
-+    "AF08": "FA709C7E-65B1-4593-BFD5-E71D61DE9B02",
-+    "AF09": "BBBA6DF5-F46F-4A89-8F59-8765B2727503",
-+    "AF0A": "7C3457EF-0000-11AA-AA11-00306543ECAC",
-+    "AF0B": "69646961-6700-11AA-AA11-00306543ECAC",
-+    "AF0C": "52637672-7900-11AA-AA11-00306543ECAC",
-+    "B000": "3DE21764-95BD-54BD-A5C3-4ABE786F38A8",
-+    "B300": "CEF5A9AD-73BC-4601-89F3-CDEEEEE321A1",
-+    "BB00": "4778ED65-BF42-45FA-9C5B-287A1DC4AAB1",
-+    "BC00": "0311FC50-01CA-4725-AD77-9ADBB20ACE98",
-+    "BE00": "6A82CB45-1DD2-11B2-99A6-080020736631",
-+    "BF00": "6A85CF4D-1DD2-11B2-99A6-080020736631",
-+    "BF01": "6A898CC3-1DD2-11B2-99A6-080020736631",
-+    "BF02": "6A87C46F-1DD2-11B2-99A6-080020736631",
-+    "BF03": "6A8B642B-1DD2-11B2-99A6-080020736631",
-+    "BF04": "6A8EF2E9-1DD2-11B2-99A6-080020736631",
-+    "BF05": "6A90BA39-1DD2-11B2-99A6-080020736631",
-+    "BF06": "6A9283A5-1DD2-11B2-99A6-080020736631",
-+    "BF07": "6A945A3B-1DD2-11B2-99A6-080020736631",
-+    "BF08": "6A9630D1-1DD2-11B2-99A6-080020736631",
-+    "BF09": "6A980767-1DD2-11B2-99A6-080020736631",
-+    "BF0A": "6A96237F-1DD2-11B2-99A6-080020736631",
-+    "BF0B": "6A8D2AC7-1DD2-11B2-99A6-080020736631",
-+    "C001": "75894C1E-3AEB-11D3-B7C1-7B03A0000000",
-+    "C002": "E2A1E728-32E3-11D6-A682-7B03A0000000",
-+    "E100": "7412F7D5-A156-4B13-81DC-867174929325",
-+    "E101": "D4E6E2CD-4469-46F3-B5CB-1BFF57AFC149",
-+    "E900": "8C8F8EFF-AC95-4770-814A-21994F2DBC8F",
-+    "EA00": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
-+    "EB00": "42465331-3BA3-10F1-802A-4861696B7521",
-+    "ED00": "F4019732-066E-4E12-8273-346C5641494F",
-+    "ED01": "BFBFAFE7-A34F-448A-9A5B-6213EB736C22",
-+    "EF00": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
-+    "EF01": "024DEE41-33E7-11D3-9D69-0008C781F39F",
-+    "EF02": "21686148-6449-6E6F-744E-656564454649",
-+    "F100": "FE8A2634-5E2E-46BA-99E3-3A192091A350",
-+    "F101": "D9FD4535-106C-4CEC-8D37-DFC020CA87CB",
-+    "F102": "A409E16B-78AA-4ACC-995C-302352621A41",
-+    "F103": "F95D940E-CABA-4578-9B93-BB6C90F29D3E",
-+    "F104": "10B8DBAA-D2BF-42A9-98C6-A7C5DB3701E7",
-+    "F105": "49FD7CB8-DF15-4E73-B9D9-992070127F0F",
-+    "F106": "421A8BFC-85D9-4D85-ACDA-B64EEC0133E9",
-+    "F107": "9B37FFF6-2E58-466A-983A-F7926D0B04E0",
-+    "F108": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
-+    "F109": "606B000B-B7C7-4653-A7D5-B737332C899D",
-+    "F10A": "08185F0C-892D-428A-A789-DBEEC8F55E6A",
-+    "F10B": "48435546-4953-2041-494E-5354414C4C52",
-+    "F10C": "2967380E-134C-4CBB-B6DA-17E7CE1CA45D",
-+    "F10D": "41D0E340-57E3-954E-8C1E-17ECAC44CFF5",
-+    "F10E": "DE30CC86-1F4A-4A31-93C4-66F147D33E05",
-+    "F10F": "23CC04DF-C278-4CE7-8471-897D1A4BCDF7",
-+    "F110": "A0E5CF57-2DEF-46BE-A80C-A2067C37CD49",
-+    "F111": "4E5E989E-4C86-11E8-A15B-480FCF35F8E6",
-+    "F112": "5A3A90BE-4C86-11E8-A15B-480FCF35F8E6",
-+    "F113": "5ECE94FE-4C86-11E8-A15B-480FCF35F8E6",
-+    "F114": "8B94D043-30BE-4871-9DFA-D69556E8C1F3",
-+    "F115": "A13B4D9A-EC5F-11E8-97D8-6C3BE52705BF",
-+    "F116": "A288ABF2-EC5F-11E8-97D8-6C3BE52705BF",
-+    "F117": "6A2460C3-CD11-4E8B-80A8-12CCE268ED0A",
-+    "F118": "1D75395D-F2C6-476B-A8B7-45CC1C97B476",
-+    "F119": "900B0FC5-90CD-4D4F-84F9-9F8ED579DB88",
-+    "F11A": "B2B2E8D1-7C10-4EBC-A2D0-4614568260AD",
-+    "F800": "4FBD7E29-9D25-41B8-AFD0-062C0CEFF05D",
-+    "F801": "4FBD7E29-9D25-41B8-AFD0-5EC00CEFF05D",
-+    "F802": "45B0969E-9B03-4F30-B4C6-B4B80CEFF106",
-+    "F803": "45B0969E-9B03-4F30-B4C6-5EC00CEFF106",
-+    "F804": "89C57F98-2FE5-4DC0-89C1-F3AD0CEFF2BE",
-+    "F805": "89C57F98-2FE5-4DC0-89C1-5EC00CEFF2BE",
-+    "F806": "CAFECAFE-9B03-4F30-B4C6-B4B80CEFF106",
-+    "F807": "30CD0809-C2B2-499C-8879-2D6B78529876",
-+    "F808": "5CE17FCE-4087-4169-B7FF-056CC58473F9",
-+    "F809": "FB3AABF9-D25F-47CC-BF5E-721D1816496B",
-+    "F80A": "4FBD7E29-8AE0-4982-BF9D-5A8D867AF560",
-+    "F80B": "45B0969E-8AE0-4982-BF9D-5A8D867AF560",
-+    "F80C": "CAFECAFE-8AE0-4982-BF9D-5A8D867AF560",
-+    "F80D": "7F4A666A-16F3-47A2-8445-152EF4D03F6C",
-+    "F80E": "EC6D6385-E346-45DC-BE91-DA2A7C8B3261",
-+    "F80F": "01B41E1B-002A-453C-9F17-88793989FF8F",
-+    "F810": "CAFECAFE-9B03-4F30-B4C6-5EC00CEFF106",
-+    "F811": "93B0052D-02D9-4D8A-A43B-33A3EE4DFBC3",
-+    "F812": "306E8683-4FE2-4330-B7C0-00A917C16966",
-+    "F813": "45B0969E-9B03-4F30-B4C6-35865CEFF106",
-+    "F814": "CAFECAFE-9B03-4F30-B4C6-35865CEFF106",
-+    "F815": "166418DA-C469-4022-ADF4-B30AFD37F176",
-+    "F816": "86A32090-3647-40B9-BBBD-38D8C573AA86",
-+    "F817": "4FBD7E29-9D25-41B8-AFD0-35865CEFF05D",
-+    "FB00": "AA31E02A-400F-11DB-9590-000C2911D1B8",
-+    "FB01": "9198EFFC-31C0-11DB-8F78-000C2911D1B8",
-+    "FC00": "9D275380-40AD-11DB-BF97-000C2911D1B8",
-+    "FD00": "A19D880F-05FC-4D3B-A006-743F0F84911E",
-+}
-+
-+gpt_id_to_sgdisk = {v: k for k, v in reversed(sgdisk_to_gpt_id.items())}
-+
-+
- def check_partition_gpt_layout(device, layout):
-     prt_cmd = ["sgdisk", "-p", device]
-     try:

0004-downstream-Get-rid-of-gdisk-dependency.patch

@@ -1,169 +0,0 @@
-From ede946b4a212f6228dddce93ad9e5cc033cfb136 Mon Sep 17 00:00:00 2001
-From: Vitaly Kuznetsov <vkuznets@redhat.com>
-Date: Wed, 7 Aug 2024 16:47:52 +0200
-Subject: [PATCH] downstream: Get rid of gdisk dependency
-
-RH-Author: Vitaly Kuznetsov <vkuznets@redhat.com>
-RH-MergeRequest: 106: Get rid of gdisk dependency
-RH-Jira: RHEL-36093
-RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-RH-Acked-by: Cathy Avery <cavery@redhat.com>
-RH-Commit: [2/2] 7814ff343d4f8e7db95ca1853ea0079fe577354a (vkuznets/cloud-init)
-
-gdisk is not going to be shipped in RHEL10 as sfdisk is perfectly capable
-of dealing with GPT partition tables. cloud-init's upstream still relies on
-sgdisk for GPT and is reluctant to do the switch, do this downstream only
-for now.
-
-X-downstream-only: true
-
-Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
-
-Patch-name: ci-Get-rid-of-gdisk-dependency.patch
-Patch-id: 23
-Patch-present-in-specfile: True
-(cherry picked from commit 2f9c7afa82de12cbe1e7b0c65ef379015260826d)
-Signed-off-by: Cathy Avery <cavery@redhat.com>
----
- cloudinit/config/cc_disk_setup.py | 97 +++++++++++++------------------
- 1 file changed, 42 insertions(+), 55 deletions(-)
-
-diff --git a/cloudinit/config/cc_disk_setup.py b/cloudinit/config/cc_disk_setup.py
-index f297d068e..d9855f8e9 100644
---- a/cloudinit/config/cc_disk_setup.py
-+++ b/cloudinit/config/cc_disk_setup.py
-@@ -7,6 +7,7 @@
- 
- """Disk Setup: Configure partitions and filesystems."""
- 
-+import json
- import logging
- import os
- import shlex
-@@ -772,44 +773,32 @@ gpt_id_to_sgdisk = {v: k for k, v in reversed(sgdisk_to_gpt_id.items())}
- 
- 
- def check_partition_gpt_layout(device, layout):
--    prt_cmd = ["sgdisk", "-p", device]
-+    # Use sfdisk's JSON output for reliability
-+    prt_cmd = ["sfdisk", "-l", "-J", device]
-     try:
-         out, _err = subp.subp(prt_cmd, update_env=LANG_C_ENV)
-+        ptable = json.loads(out)["partitiontable"]
-+        if "partitions" in ptable:
-+            partitions = ptable["partitions"]
-+        else:
-+            partitions = []
-+
-     except Exception as e:
-         raise RuntimeError(
-             "Error running partition command on %s\n%s" % (device, e)
-         ) from e
- 
--    out_lines = iter(out.splitlines())
--    # Skip header.  Output looks like:
--    # ***************************************************************
--    # Found invalid GPT and valid MBR; converting MBR to GPT format
--    # in memory.
--    # ***************************************************************
--    #
--    # Disk /dev/vdb: 83886080 sectors, 40.0 GiB
--    # Logical sector size: 512 bytes
--    # Disk identifier (GUID): 8A7F11AD-3953-491B-8051-077E01C8E9A7
--    # Partition table holds up to 128 entries
--    # First usable sector is 34, last usable sector is 83886046
--    # Partitions will be aligned on 2048-sector boundaries
--    # Total free space is 83476413 sectors (39.8 GiB)
--    #
--    # Number Start (sector) End (sector) Size       Code  Name
--    # 1      2048           206847       100.0 MiB  0700  Microsoft basic data
--    for line in out_lines:
--        if line.strip().startswith("Number"):
--            break
--
--    codes = [line.strip().split()[5] for line in out_lines]
--    cleaned = []
--
--    # user would expect a code '83' to be Linux, but sgdisk outputs 8300.
--    for code in codes:
--        if len(code) == 4 and code.endswith("00"):
--            code = code[0:2]
--        cleaned.append(code)
--    return cleaned
-+    found_layout = []
-+    for part in partitions:
-+        if part["type"] in gpt_id_to_sgdisk:
-+            ptype = gpt_id_to_sgdisk[part["type"]]
-+            if len(ptype) == 4 and ptype[-2:] == "00":
-+                ptype = ptype[0:2]
-+            found_layout.append(ptype)
-+        else:
-+            # Unknown GPT UUID, using standard Linux
-+            found_layout.append("83")
-+    return found_layout
- 
- 
- def check_partition_layout(table_type, device, layout):
-@@ -982,11 +971,11 @@ def get_partition_layout(table_type, size, layout):
-     This is a future proofing function. To add support for
-     other layouts, simply add a "get_partition_%s_layout"
-     function.
-+
-+    RHEL-only: sfdisk is used both for GPT and MBR
-     """
--    if "mbr" == table_type:
-+    if table_type in ["gpt", "mbr"]:
-         return get_partition_mbr_layout(size, layout)
--    elif "gpt" == table_type:
--        return get_partition_gpt_layout(size, layout)
-     raise RuntimeError("Unable to determine table type")
- 
- 
-@@ -1027,28 +1016,26 @@ def exec_mkpart_mbr(device, layout):
- 
- 
- def exec_mkpart_gpt(device, layout):
-+    prt_cmd = [SFDISK_CMD, "-X", "gpt", "--force", device]
-     try:
--        subp.subp(["sgdisk", "-Z", device])
--        for index, (partition_type, (start, end)) in enumerate(layout):
--            index += 1
--            subp.subp(
--                [
--                    "sgdisk",
--                    "-n",
--                    "{}:{}:{}".format(index, start, end),
--                    device,
--                ]
--            )
--            if partition_type is not None:
--                # convert to a 4 char (or more) string right padded with 0
--                # 82 -> 8200.  'Linux' -> 'Linux'
--                pinput = str(partition_type).ljust(4, "0")
--                subp.subp(
--                    ["sgdisk", "-t", "{}:{}".format(index, pinput), device]
--                )
--    except Exception:
--        LOG.warning("Failed to partition device %s", device)
--        raise
-+        layout_fixed = []
-+        # convert partition UUIDs to GPT UUIDs
-+        for part in layout.split("\n"):
-+            (pstart, psize, ptype) = part.split(",")
-+            if len(ptype) == 2:
-+                ptype = ptype + "00"
-+            if ptype.upper() in sgdisk_to_gpt_id:
-+                ptype = sgdisk_to_gpt_id[ptype]
-+            else:
-+                # Use standard Linux for unknown ids
-+                ptype = "0FC63DAF-8483-4772-8E79-3D69D8477DE4"
-+            layout_fixed.append(",".join([pstart, psize, ptype]))
-+        layout = "\n".join(layout_fixed)
-+        subp.subp(prt_cmd, data="%s\n" % layout)
-+    except Exception as e:
-+        raise RuntimeError(
-+            "Failed to partition device %s\n%s" % (device, e)
-+        ) from e
- 
-     read_parttbl(device)
- 

0005-downstream-Revert-chore-eliminate-redundant-ordering.patch

@@ -1,86 +0,0 @@
-From 829fedbff92a9d4385264b974e5dba4bded79bc3 Mon Sep 17 00:00:00 2001
-From: Ani Sinha <anisinha@redhat.com>
-Date: Fri, 6 Dec 2024 16:53:25 +0530
-Subject: [PATCH] downstream: Revert "chore: eliminate redundant ordering
- dependencies (#5819)"
-
-This reverts commit 0680d03304c34fc4c3081f29d99f140d507dd923.
-
-The reversal is necessary because the original change was meant to work with
-the 'single process optimization' patch. Since we are reverting the
-'single process optimization' (see next patch), we should revert this as well.
-
-Moreover, without the reversal, we get the following error from
-cloud-init-local:
-
-Traceback (most recent call last):
-  File "/usr/lib/python3.9/site-packages/cloudinit/config/cc_set_hostname.py", line 86, in handle
-    cloud.distro.set_hostname(hostname, fqdn)
-  File "/usr/lib/python3.9/site-packages/cloudinit/distros/__init__.py", line 395, in set_hostname
-    self._write_hostname(writeable_hostname, self.hostname_conf_fn)
-  File "/usr/lib/python3.9/site-packages/cloudinit/distros/rhel.py", line 119, in _write_hostname
-    subp.subp(["hostnamectl", "set-hostname", str(hostname)])
-  File "/usr/lib/python3.9/site-packages/cloudinit/subp.py", line 291, in subp
-    raise ProcessExecutionError(
-cloudinit.subp.ProcessExecutionError: Unexpected error while running command.
-Command: ['hostnamectl', 'set-hostname', 'kvm-cloudinit-test']
-Exit code: 1
-Reason: -
-Stdout:
-Stderr: Failed to connect to bus: No such file or directory
-
-Jira: https://issues.redhat.com/browse/RHEL-70365
-X-downstream-only: true
-Signed-off-by: Ani Sinha <anisinha@redhat.com>
-Signed-off-by: Cathy Avery <cavery@redhat.com>
----
- systemd/cloud-init-local.service.tmpl | 5 +++++
- systemd/cloud-init-main.service.tmpl  | 6 ++++++
- 2 files changed, 11 insertions(+)
-
-diff --git a/systemd/cloud-init-local.service.tmpl b/systemd/cloud-init-local.service.tmpl
-index e6a300fd4..f6a6cce41 100644
---- a/systemd/cloud-init-local.service.tmpl
-+++ b/systemd/cloud-init-local.service.tmpl
-@@ -7,6 +7,10 @@ DefaultDependencies=no
- {% endif %}
- Wants=network-pre.target
- After=hv_kvp_daemon.service
-+{% if variant in ["almalinux", "cloudlinux", "rhel"] %}
-+Requires=dbus.socket
-+After=dbus.socket
-+{% endif %}
- Before=network-pre.target
- Before=shutdown.target
- {% if variant in ["almalinux", "cloudlinux", "rhel"] %}
-@@ -16,6 +20,7 @@ Before=firewalld.target
- Before=sysinit.target
- {% endif %}
- Conflicts=shutdown.target
-+RequiresMountsFor=/var/lib/cloud
- ConditionPathExists=!/etc/cloud/cloud-init.disabled
- ConditionKernelCommandLine=!cloud-init=disabled
- ConditionEnvironment=!KERNEL_CMDLINE=cloud-init=disabled
-diff --git a/systemd/cloud-init-main.service.tmpl b/systemd/cloud-init-main.service.tmpl
-index b80f324fe..7a42a5746 100644
---- a/systemd/cloud-init-main.service.tmpl
-+++ b/systemd/cloud-init-main.service.tmpl
-@@ -8,12 +8,18 @@
- # https://www.freedesktop.org/software/systemd/man/latest/systemd-remount-fs.service.html
- [Unit]
- Description=Cloud-init: Single Process
-+Wants=network-pre.target
- {% if variant in ["almalinux", "cloudlinux", "ubuntu", "unknown", "debian", "rhel"] %}
- DefaultDependencies=no
- {% endif %}
- {% if variant in ["almalinux", "cloudlinux", "rhel"] %}
- Requires=dbus.socket
- After=dbus.socket
-+Before=network.service
-+Before=firewalld.target
-+{% endif %}
-+{% if variant in ["ubuntu", "unknown", "debian"] %}
-+Before=sysinit.target
- {% endif %}
- 
- After=systemd-remount-fs.service

0006-downstream-remove-single-process-optimization.patch

@@ -1,267 +0,0 @@
-From a4f4d6b0bedbd8eb7287e799607b49a4e78932a4 Mon Sep 17 00:00:00 2001
-From: Ani Sinha <anisinha@redhat.com>
-Date: Tue, 3 Dec 2024 09:29:15 +0530
-Subject: [PATCH] downstream: remove single process optimization
-
-This optimization is a big change in behavior, patch it out.
-Patch is taken from
-https://github.com/canonical/cloud-init/blob/ubuntu/noble/debian/patches/no-single-process.patch
-
-X-downstream-only: true
-Signed-off-by: Ani Sinha <anisinha@redhat.com>
-Signed-off-by: Cathy Avery <cavery@redhat.com>
----
- cloudinit/cmd/status.py                       |  3 +-
- cloudinit/config/cc_mounts.py                 |  2 +-
- .../schemas/schema-cloud-config-v1.json       |  4 +-
- systemd/cloud-config.service                  |  9 +---
- systemd/cloud-config.target                   |  4 +-
- systemd/cloud-final.service                   | 10 +---
- systemd/cloud-init-local.service.tmpl         | 10 +---
- systemd/cloud-init-main.service.tmpl          | 48 -------------------
- ...k.service.tmpl => cloud-init.service.tmpl} | 12 +----
- tests/unittests/config/test_cc_mounts.py      |  4 +-
- 10 files changed, 15 insertions(+), 91 deletions(-)
- delete mode 100644 systemd/cloud-init-main.service.tmpl
- rename systemd/{cloud-init-network.service.tmpl => cloud-init.service.tmpl} (69%)
-
-diff --git a/cloudinit/cmd/status.py b/cloudinit/cmd/status.py
-index 98084a492..882492d96 100644
---- a/cloudinit/cmd/status.py
-+++ b/cloudinit/cmd/status.py
-@@ -318,9 +318,8 @@ def systemd_failed(wait: bool) -> bool:
-     for service in [
-         "cloud-final.service",
-         "cloud-config.service",
--        "cloud-init-network.service",
-+        "cloud-init.service",
-         "cloud-init-local.service",
--        "cloud-init-main.service",
-     ]:
-         try:
-             stdout = query_systemctl(
-diff --git a/cloudinit/config/cc_mounts.py b/cloudinit/config/cc_mounts.py
-index cec092902..cb36bdb87 100644
---- a/cloudinit/config/cc_mounts.py
-+++ b/cloudinit/config/cc_mounts.py
-@@ -521,7 +521,7 @@ def handle(name: str, cfg: Config, cloud: Cloud, args: list) -> None:
-     # fs_spec, fs_file, fs_vfstype, fs_mntops, fs-freq, fs_passno
-     uses_systemd = cloud.distro.uses_systemd()
-     default_mount_options = (
--        "defaults,nofail,x-systemd.after=cloud-init-network.service,_netdev"
-+        "defaults,nofail,x-systemd.after=cloud-init.service,_netdev"
-         if uses_systemd
-         else "defaults,nobootwait"
-     )
-diff --git a/cloudinit/config/schemas/schema-cloud-config-v1.json b/cloudinit/config/schemas/schema-cloud-config-v1.json
-index fffa04b52..7d5c87c60 100644
---- a/cloudinit/config/schemas/schema-cloud-config-v1.json
-+++ b/cloudinit/config/schemas/schema-cloud-config-v1.json
-@@ -2029,12 +2029,12 @@
-         },
-         "mount_default_fields": {
-           "type": "array",
--          "description": "Default mount configuration for any mount entry with less than 6 options provided. When specified, 6 items are required and represent ``/etc/fstab`` entries. Default: ``defaults,nofail,x-systemd.after=cloud-init-network.service,_netdev``.",
-+          "description": "Default mount configuration for any mount entry with less than 6 options provided. When specified, 6 items are required and represent ``/etc/fstab`` entries. Default: ``defaults,nofail,x-systemd.after=cloud-init.service,_netdev``.",
-           "default": [
-             null,
-             null,
-             "auto",
--            "defaults,nofail,x-systemd.after=cloud-init-network.service",
-+            "defaults,nofail,x-systemd.after=cloud-init.service",
-             "0",
-             "2"
-           ],
-diff --git a/systemd/cloud-config.service b/systemd/cloud-config.service
-index 54599b346..79ff733a4 100644
---- a/systemd/cloud-config.service
-+++ b/systemd/cloud-config.service
-@@ -9,14 +9,7 @@ ConditionEnvironment=!KERNEL_CMDLINE=cloud-init=disabled
- 
- [Service]
- Type=oneshot
--# This service is a shim which preserves systemd ordering while allowing a
--# single Python process to run cloud-init's logic. This works by communicating
--# with the cloud-init process over a unix socket to tell the process that this
--# stage can start, and then wait on a return socket until the cloud-init
--# process has completed this stage. The output from the return socket is piped
--# into a shell so that the process can send a completion message (defaults to
--# "done", otherwise includes an error message) and an exit code to systemd.
--ExecStart=sh -c 'echo "start" | netcat -Uu -W1 /run/cloud-init/share/config.sock -s /run/cloud-init/share/config-return.sock | sh'
-+ExecStart=/usr/bin/cloud-init modules --mode=config
- RemainAfterExit=yes
- TimeoutSec=0
- 
-diff --git a/systemd/cloud-config.target b/systemd/cloud-config.target
-index be754bbd1..2d65e3433 100644
---- a/systemd/cloud-config.target
-+++ b/systemd/cloud-config.target
-@@ -14,5 +14,5 @@
- 
- [Unit]
- Description=Cloud-config availability
--Wants=cloud-init-local.service cloud-init-network.service
--After=cloud-init-local.service cloud-init-network.service
-+Wants=cloud-init-local.service cloud-init.service
-+After=cloud-init-local.service cloud-init.service
-diff --git a/systemd/cloud-final.service b/systemd/cloud-final.service
-index c48f95c4f..1489eb356 100644
---- a/systemd/cloud-final.service
-+++ b/systemd/cloud-final.service
-@@ -12,16 +12,10 @@ ConditionEnvironment=!KERNEL_CMDLINE=cloud-init=disabled
- 
- [Service]
- Type=oneshot
--# This service is a shim which preserves systemd ordering while allowing a
--# single Python process to run cloud-init's logic. This works by communicating
--# with the cloud-init process over a unix socket to tell the process that this
--# stage can start, and then wait on a return socket until the cloud-init
--# process has completed this stage. The output from the return socket is piped
--# into a shell so that the process can send a completion message (defaults to
--# "done", otherwise includes an error message) and an exit code to systemd.
--ExecStart=sh -c 'echo "start" | netcat -Uu -W1 /run/cloud-init/share/final.sock -s /run/cloud-init/share/final-return.sock | sh'
-+ExecStart=/usr/bin/cloud-init modules --mode=final
- RemainAfterExit=yes
- TimeoutSec=0
-+KillMode=process
- TasksMax=infinity
- 
- # Output needs to appear in instance console output
-diff --git a/systemd/cloud-init-local.service.tmpl b/systemd/cloud-init-local.service.tmpl
-index f6a6cce41..a3859dfeb 100644
---- a/systemd/cloud-init-local.service.tmpl
-+++ b/systemd/cloud-init-local.service.tmpl
-@@ -11,6 +11,7 @@ After=hv_kvp_daemon.service
- Requires=dbus.socket
- After=dbus.socket
- {% endif %}
-+After=systemd-remount-fs.service
- Before=network-pre.target
- Before=shutdown.target
- {% if variant in ["almalinux", "cloudlinux", "rhel"] %}
-@@ -30,14 +31,7 @@ Type=oneshot
- {% if variant in ["almalinux", "cloudlinux", "rhel"] %}
- ExecStartPre=/sbin/restorecon /run/cloud-init
- {% endif %}
--# This service is a shim which preserves systemd ordering while allowing a
--# single Python process to run cloud-init's logic. This works by communicating
--# with the cloud-init process over a unix socket to tell the process that this
--# stage can start, and then wait on a return socket until the cloud-init
--# process has completed this stage. The output from the return socket is piped
--# into a shell so that the process can send a completion message (defaults to
--# "done", otherwise includes an error message) and an exit code to systemd.
--ExecStart=sh -c 'echo "start" | netcat -Uu -W1 /run/cloud-init/share/local.sock -s /run/cloud-init/share/local-return.sock | sh'
-+ExecStart=/usr/bin/cloud-init init --local
- RemainAfterExit=yes
- TimeoutSec=0
- 
-diff --git a/systemd/cloud-init-main.service.tmpl b/systemd/cloud-init-main.service.tmpl
-deleted file mode 100644
-index 7a42a5746..000000000
---- a/systemd/cloud-init-main.service.tmpl
-+++ /dev/null
-@@ -1,48 +0,0 @@
--## template:jinja
--# systemd ordering resources
--# ==========================
--# https://systemd.io/NETWORK_ONLINE/
--# https://docs.cloud-init.io/en/latest/explanation/boot.html
--# https://www.freedesktop.org/wiki/Software/systemd/NetworkTarget/
--# https://www.freedesktop.org/software/systemd/man/latest/systemd.special.html
--# https://www.freedesktop.org/software/systemd/man/latest/systemd-remount-fs.service.html
--[Unit]
--Description=Cloud-init: Single Process
--Wants=network-pre.target
--{% if variant in ["almalinux", "cloudlinux", "ubuntu", "unknown", "debian", "rhel"] %}
--DefaultDependencies=no
--{% endif %}
--{% if variant in ["almalinux", "cloudlinux", "rhel"] %}
--Requires=dbus.socket
--After=dbus.socket
--Before=network.service
--Before=firewalld.target
--{% endif %}
--{% if variant in ["ubuntu", "unknown", "debian"] %}
--Before=sysinit.target
--{% endif %}
--
--After=systemd-remount-fs.service
--Before=cloud-init-local.service
--Before=shutdown.target
--Conflicts=shutdown.target
--RequiresMountsFor=/var/lib/cloud
--ConditionPathExists=!/etc/cloud/cloud-init.disabled
--ConditionKernelCommandLine=!cloud-init=disabled
--ConditionEnvironment=!KERNEL_CMDLINE=cloud-init=disabled
--
--[Service]
--Type=notify
--ExecStart=/usr/bin/cloud-init --all-stages
--KillMode=process
--TasksMax=infinity
--TimeoutStartSec=infinity
--{% if variant in ["almalinux", "cloudlinux", "rhel"] %}
--ExecStartPre=/sbin/restorecon /run/cloud-init
--{% endif %}
--
--# Output needs to appear in instance console output
--StandardOutput=journal+console
--
--[Install]
--WantedBy=cloud-init.target
-diff --git a/systemd/cloud-init-network.service.tmpl b/systemd/cloud-init.service.tmpl
-similarity index 69%
-rename from systemd/cloud-init-network.service.tmpl
-rename to systemd/cloud-init.service.tmpl
-index af09fff35..939544313 100644
---- a/systemd/cloud-init-network.service.tmpl
-+++ b/systemd/cloud-init.service.tmpl
-@@ -9,15 +9,14 @@ Wants=cloud-init-local.service
- Wants=sshd-keygen.service
- Wants=sshd.service
- After=cloud-init-local.service
--{% if variant not in ["ubuntu"] %}
- After=systemd-networkd-wait-online.service
--{% endif %}
- {% if variant in ["ubuntu", "unknown", "debian"] %}
- After=networking.service
- {% endif %}
- {% if variant in ["almalinux", "centos", "cloudlinux", "eurolinux", "fedora",
-                   "miraclelinux", "openeuler", "OpenCloudOS", "openmandriva", "rhel", "rocky",
-                   "suse", "TencentOS", "virtuozzo"] %}
-+
- After=NetworkManager.service
- After=NetworkManager-wait-online.service
- {% endif %}
-@@ -46,14 +45,7 @@ ConditionEnvironment=!KERNEL_CMDLINE=cloud-init=disabled
- 
- [Service]
- Type=oneshot
--# This service is a shim which preserves systemd ordering while allowing a
--# single Python process to run cloud-init's logic. This works by communicating
--# with the cloud-init process over a unix socket to tell the process that this
--# stage can start, and then wait on a return socket until the cloud-init
--# process has completed this stage. The output from the return socket is piped
--# into a shell so that the process can send a completion message (defaults to
--# "done", otherwise includes an error message) and an exit code to systemd.
--ExecStart=sh -c 'echo "start" | netcat -Uu -W1 /run/cloud-init/share/network.sock -s /run/cloud-init/share/network-return.sock | sh'
-+ExecStart=/usr/bin/cloud-init init
- RemainAfterExit=yes
- TimeoutSec=0
- 
-diff --git a/tests/unittests/config/test_cc_mounts.py b/tests/unittests/config/test_cc_mounts.py
-index 0e6d83793..f710d8a4f 100644
---- a/tests/unittests/config/test_cc_mounts.py
-+++ b/tests/unittests/config/test_cc_mounts.py
-@@ -566,9 +566,9 @@ class TestFstabHandling:
-             LABEL=keepme	none	ext4	defaults	0	0
-             LABEL=UEFI
-             /dev/sda4	/mnt2	auto	nofail,comment=cloudconfig	1	2
--            /dev/sda5	/mnt3	auto	defaults,nofail,x-systemd.after=cloud-init-network.service,_netdev,comment=cloudconfig	0	2
-+            /dev/sda5	/mnt3	auto	defaults,nofail,x-systemd.after=cloud-init.service,_netdev,comment=cloudconfig	0	2
-             /dev/sda1	/mnt	xfs	auto,comment=cloudconfig	0	2
--            /dev/sda3	/mnt4	btrfs	defaults,nofail,x-systemd.after=cloud-init-network.service,_netdev,comment=cloudconfig	0	2
-+            /dev/sda3	/mnt4	btrfs	defaults,nofail,x-systemd.after=cloud-init.service,_netdev,comment=cloudconfig	0	2
-             /dev/sdb1	none	swap	sw,comment=cloudconfig	0	0
-             """  # noqa: E501
-             ).strip()

0007-fix-don-t-deadlock-when-starting-network-service-wit.patch

@@ -1,90 +0,0 @@
-From 5f3213d8af6f1130d7fffb02ba420af802f916c2 Mon Sep 17 00:00:00 2001
-From: Brett Holman <brett.holman@canonical.com>
-Date: Tue, 17 Dec 2024 19:28:56 -0700
-Subject: [PATCH] fix: don't deadlock when starting network service with
- systemctl (#5935)
-
-(cherry picked from commit bc26e15fd09b65a38ddd8cbafc5379cb19960d2b)
-Signed-off-by: Ani Sinha <anisinha@redhat.com>
----
- cloudinit/config/cc_set_passwords.py          | 20 ++++++++++++++++---
- cloudinit/distros/__init__.py                 |  4 ++--
- .../unittests/config/test_cc_set_passwords.py |  4 +++-
- 3 files changed, 22 insertions(+), 6 deletions(-)
-
-diff --git a/cloudinit/config/cc_set_passwords.py b/cloudinit/config/cc_set_passwords.py
-index 8cb6a1ec5..22547d0fd 100644
---- a/cloudinit/config/cc_set_passwords.py
-+++ b/cloudinit/config/cc_set_passwords.py
-@@ -45,9 +45,9 @@ def get_users_by_type(users_list: list, pw_type: str) -> list:
-     )
- 
- 
--def _restart_ssh_daemon(distro, service):
-+def _restart_ssh_daemon(distro: Distro, service: str, *extra_args: str):
-     try:
--        distro.manage_service("restart", service)
-+        distro.manage_service("restart", service, *extra_args)
-         LOG.debug("Restarted the SSH daemon.")
-     except subp.ProcessExecutionError as e:
-         LOG.warning(
-@@ -104,7 +104,21 @@ def handle_ssh_pwauth(pw_auth, distro: Distro):
-             ]
-         ).stdout.strip()
-         if state.lower() in ["active", "activating", "reloading"]:
--            _restart_ssh_daemon(distro, service)
-+            # This module runs Before=sshd.service. What that means is that
-+            # the code can only get to this point if a user manually starts the
-+            # network stage. While this isn't a well-supported use-case, this
-+            # does cause a deadlock if started via systemd directly:
-+            # "systemctl start cloud-init.service". Prevent users from causing
-+            # this deadlock by forcing systemd to ignore dependencies when
-+            # restarting. Note that this deadlock is not possible in newer
-+            # versions of cloud-init, since starting the second service doesn't
-+            # run the second stage in 24.3+. This code therefore exists solely
-+            # for backwards compatibility so that users who think that they
-+            # need to manually start cloud-init (why?) with systemd (again,
-+            # why?) can do so.
-+            _restart_ssh_daemon(
-+                distro, service, "--job-mode=ignore-dependencies"
-+            )
-     else:
-         _restart_ssh_daemon(distro, service)
- 
-diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py
-index 183df368a..34c0836e8 100644
---- a/cloudinit/distros/__init__.py
-+++ b/cloudinit/distros/__init__.py
-@@ -142,7 +142,7 @@ class Distro(persistence.CloudInitPickleMixin, metaclass=abc.ABCMeta):
-     shadow_empty_locked_passwd_patterns = ["^{username}::", "^{username}:!:"]
-     tz_zone_dir = "/usr/share/zoneinfo"
-     default_owner = "root:root"
--    init_cmd = ["service"]  # systemctl, service etc
-+    init_cmd: List[str] = ["service"]  # systemctl, service etc
-     renderer_configs: Mapping[str, MutableMapping[str, Any]] = {}
-     _preferred_ntp_clients = None
-     networking_cls: Type[Networking] = LinuxNetworking
-@@ -1373,7 +1373,7 @@ class Distro(persistence.CloudInitPickleMixin, metaclass=abc.ABCMeta):
-                 "try-reload": [service, "restart"],
-                 "status": [service, "status"],
-             }
--        cmd = list(init_cmd) + list(cmds[action])
-+        cmd = init_cmd + cmds[action] + list(extra_args)
-         return subp.subp(cmd, capture=True, rcs=rcs)
- 
-     def set_keymap(self, layout: str, model: str, variant: str, options: str):
-diff --git a/tests/unittests/config/test_cc_set_passwords.py b/tests/unittests/config/test_cc_set_passwords.py
-index c068f62d8..a706917d7 100644
---- a/tests/unittests/config/test_cc_set_passwords.py
-+++ b/tests/unittests/config/test_cc_set_passwords.py
-@@ -27,7 +27,9 @@ SYSTEMD_CHECK_CALL = mock.call(
-     ["systemctl", "show", "--property", "ActiveState", "--value", "ssh"]
- )
- SYSTEMD_RESTART_CALL = mock.call(
--    ["systemctl", "restart", "ssh"], capture=True, rcs=None
-+    ["systemctl", "restart", "ssh", "--job-mode=ignore-dependencies"],
-+    capture=True,
-+    rcs=None,
- )
- SERVICE_RESTART_CALL = mock.call(
-     ["service", "ssh", "restart"], capture=True, rcs=None

0031-Improvements-for-AlmaLinux-OS-and-CloudLinux-OS.patch

@@ -1,457 +0,0 @@
-From f4f100c0dddf1f11b239374a8dc452739b8e6a81 Mon Sep 17 00:00:00 2001
-From: Andrew Lukoshko <alukoshko@almalinux.org>
-Date: Thu, 28 Mar 2024 14:24:08 +0000
-Subject: [PATCH] Improvements for AlmaLinux OS and CloudLinux OS
-
-Add AlmaLinux OS and CloudLinux OS support to:
-
-Modules:
-- cc_ca_certs
-- cc_ntp
-- cc_resolv_conf
-
-Datasources:
-- Rbx Cloud Datasource
-
-Systemd services:
-- cloud-final.service
-- cloud-init-local.service
-- cloud-init.service
----
- cloudinit/config/cc_ca_certs.py         |  8 ++++
- cloudinit/config/cc_ntp.py              | 11 ++---
- cloudinit/config/cc_resolv_conf.py      |  2 +
- cloudinit/settings.py                   |  2 +-
- cloudinit/sources/DataSourceRbxCloud.py |  2 +-
- systemd/cloud-final.service.tmpl        |  2 +-
- systemd/cloud-init-local.service.tmpl   | 10 ++--
- systemd/cloud-init.service.tmpl         |  2 +-
- templates/chrony.conf.almalinux.tmpl    | 51 ++++++++++++++++++++
- templates/chrony.conf.cloudlinux.tmpl   | 51 ++++++++++++++++++++
- templates/ntp.conf.almalinux.tmpl       | 64 +++++++++++++++++++++++++
- templates/ntp.conf.cloudlinux.tmpl      | 64 +++++++++++++++++++++++++
- 12 files changed, 252 insertions(+), 17 deletions(-)
- create mode 100644 templates/chrony.conf.almalinux.tmpl
- create mode 100644 templates/chrony.conf.cloudlinux.tmpl
- create mode 100644 templates/ntp.conf.almalinux.tmpl
- create mode 100644 templates/ntp.conf.cloudlinux.tmpl
-
-diff --git a/cloudinit/config/cc_ca_certs.py b/cloudinit/config/cc_ca_certs.py
-index 8d3fd9a..4dd5843 100644
---- a/cloudinit/config/cc_ca_certs.py
-+++ b/cloudinit/config/cc_ca_certs.py
-@@ -57,6 +57,12 @@ for distro in (
- ):
-     DISTRO_OVERRIDES[distro] = DISTRO_OVERRIDES["opensuse"]
- 
-+for distro in (
-+    "almalinux",
-+    "cloudlinux",
-+):
-+    DISTRO_OVERRIDES[distro] = DISTRO_OVERRIDES["rhel"]
-+
- MODULE_DESCRIPTION = """\
- This module adds CA certificates to the system's CA store and updates any
- related files using the appropriate OS-specific utility. The default CA
-@@ -72,6 +78,8 @@ configuration option ``remove_defaults``.
-     order to provide the ``update-ca-certificates`` command.
- """
- distros = [
-+    "almalinux",
-+    "cloudlinux",
-     "alpine",
-     "debian",
-     "fedora",
-diff --git a/cloudinit/config/cc_ntp.py b/cloudinit/config/cc_ntp.py
-index 9eef24f..1015d43 100644
---- a/cloudinit/config/cc_ntp.py
-+++ b/cloudinit/config/cc_ntp.py
-@@ -109,14 +109,6 @@ DISTRO_CLIENT_CONFIG = {
-             "service_name": "ntpd",
-         },
-     },
--    "centos": {
--        "ntp": {
--            "service_name": "ntpd",
--        },
--        "chrony": {
--            "service_name": "chronyd",
--        },
--    },
-     "cos": {
-         "chrony": {
-             "service_name": "chronyd",
-@@ -224,6 +216,9 @@ DISTRO_CLIENT_CONFIG = {
- for distro in ("opensuse-microos", "opensuse-tumbleweed", "opensuse-leap"):
-     DISTRO_CLIENT_CONFIG[distro] = DISTRO_CLIENT_CONFIG["opensuse"]
- 
-+for distro in ("almalinux", "centos", "cloudlinux"):
-+    DISTRO_CLIENT_CONFIG[distro] = DISTRO_CLIENT_CONFIG["rhel"]
-+
- for distro in ("sle_hpc", "sle-micro"):
-     DISTRO_CLIENT_CONFIG[distro] = DISTRO_CLIENT_CONFIG["sles"]
- 
-diff --git a/cloudinit/config/cc_resolv_conf.py b/cloudinit/config/cc_resolv_conf.py
-index aa88919..4eb1d76 100644
---- a/cloudinit/config/cc_resolv_conf.py
-+++ b/cloudinit/config/cc_resolv_conf.py
-@@ -57,7 +57,9 @@ meta: MetaSchema = {
-     "title": "Configure resolv.conf",
-     "description": MODULE_DESCRIPTION,
-     "distros": [
-+        "almalinux",
-         "alpine",
-+        "cloudlinux",
-         "fedora",
-         "mariner",
-         "opensuse",
-diff --git a/cloudinit/settings.py b/cloudinit/settings.py
-index 5ced21b..51cb115 100644
---- a/cloudinit/settings.py
-+++ b/cloudinit/settings.py
-@@ -61,7 +61,7 @@ CFG_BUILTIN = {
-             "cloud_dir": "/var/lib/cloud",
-             "templates_dir": "/etc/cloud/templates/",
-         },
--        "distro": "rhel",
-+        "distro": "almalinux",
-         "network": {"renderers": None},
-     },
-     "vendor_data": {"enabled": True, "prefix": []},
-diff --git a/cloudinit/sources/DataSourceRbxCloud.py b/cloudinit/sources/DataSourceRbxCloud.py
-index 9214f1b..14880ec 100644
---- a/cloudinit/sources/DataSourceRbxCloud.py
-+++ b/cloudinit/sources/DataSourceRbxCloud.py
-@@ -60,7 +60,7 @@ def _sub_arp(cmd):
- 
- def gratuitous_arp(items, distro):
-     source_param = "-S"
--    if distro.name in ["fedora", "centos", "rhel"]:
-+    if distro.name in ["almalinux", "fedora", "centos", "cloudlinux", "rhel"]:
-         source_param = "-s"
-     for item in items:
-         try:
-diff --git a/systemd/cloud-final.service.tmpl b/systemd/cloud-final.service.tmpl
-index bcf8b00..6d34761 100644
---- a/systemd/cloud-final.service.tmpl
-+++ b/systemd/cloud-final.service.tmpl
-@@ -18,7 +18,7 @@ ExecStart=/usr/bin/cloud-init modules --mode=final
- RemainAfterExit=yes
- TimeoutSec=0
- KillMode=process
--{% if variant == "rhel" %}
-+{% if variant in ["almalinux", "cloudlinux", "rhel"] %}
- # Restart NetworkManager if it is present and running.
- ExecStartPost=/bin/sh -c 'u=NetworkManager.service; \
-  out=$(systemctl show --property=SubState $u) || exit; \
-diff --git a/systemd/cloud-init-local.service.tmpl b/systemd/cloud-init-local.service.tmpl
-index 3a1ca7f..853ae2c 100644
---- a/systemd/cloud-init-local.service.tmpl
-+++ b/systemd/cloud-init-local.service.tmpl
-@@ -1,23 +1,23 @@
- ## template:jinja
- [Unit]
- Description=Initial cloud-init job (pre-networking)
--{% if variant in ["ubuntu", "unknown", "debian", "rhel" ] %}
-+{% if variant in ["almalinux", "cloudlinux", "ubuntu", "unknown", "debian", "rhel" ] %}
- DefaultDependencies=no
- {% endif %}
- Wants=network-pre.target
- After=hv_kvp_daemon.service
- After=systemd-remount-fs.service
--{% if variant == "rhel" %}
-+{% if variant in ["almalinux", "cloudlinux", "rhel"] %}
- Requires=dbus.socket
- After=dbus.socket
- {% endif %}
- Before=NetworkManager.service
--{% if variant == "rhel" %}
-+{% if variant in ["almalinux", "cloudlinux", "rhel"] %}
- Before=network.service
- {% endif %}
- Before=network-pre.target
- Before=shutdown.target
--{% if variant == "rhel" %}
-+{% if variant in ["almalinux", "cloudlinux", "rhel"] %}
- Before=firewalld.target
- Conflicts=shutdown.target
- {% endif %}
-@@ -32,7 +32,7 @@ ConditionEnvironment=!KERNEL_CMDLINE=cloud-init=disabled
- 
- [Service]
- Type=oneshot
--{% if variant == "rhel" %}
-+{% if variant in ["almalinux", "cloudlinux", "rhel"] %}
- ExecStartPre=/bin/mkdir -p /run/cloud-init
- ExecStartPre=/sbin/restorecon /run/cloud-init
- ExecStartPre=/usr/bin/touch /run/cloud-init/enabled
-diff --git a/systemd/cloud-init.service.tmpl b/systemd/cloud-init.service.tmpl
-index bf91164..1ae88f7 100644
---- a/systemd/cloud-init.service.tmpl
-+++ b/systemd/cloud-init.service.tmpl
-@@ -1,7 +1,7 @@
- ## template:jinja
- [Unit]
- Description=Initial cloud-init job (metadata service crawler)
--{% if variant not in ["photon", "rhel"] %}
-+{% if variant not in ["almalinux", "cloudlinux", "photon", "rhel"] %}
- DefaultDependencies=no
- {% endif %}
- Wants=cloud-init-local.service
-diff --git a/templates/chrony.conf.almalinux.tmpl b/templates/chrony.conf.almalinux.tmpl
-new file mode 100644
-index 0000000..43b1f5d
---- /dev/null
-+++ b/templates/chrony.conf.almalinux.tmpl
-@@ -0,0 +1,51 @@
-+## template:jinja
-+# Use public servers from the pool.ntp.org project.
-+# Please consider joining the pool (http://www.pool.ntp.org/join.html).
-+{% if pools %}# pools
-+{% endif %}
-+{% for pool in pools -%}
-+pool {{pool}} iburst
-+{% endfor %}
-+{%- if servers %}# servers
-+{% endif %}
-+{% for server in servers -%}
-+server {{server}} iburst
-+{% endfor %}
-+{% for peer in peers -%}
-+peer {{peer}}
-+{% endfor %}
-+{% for a in allow -%}
-+allow {{a}}
-+{% endfor %}
-+
-+# Record the rate at which the system clock gains/losses time.
-+driftfile /var/lib/chrony/drift
-+
-+# Allow the system clock to be stepped in the first three updates
-+# if its offset is larger than 1 second.
-+makestep 1.0 3
-+
-+# Enable kernel synchronization of the real-time clock (RTC).
-+rtcsync
-+
-+# Enable hardware timestamping on all interfaces that support it.
-+#hwtimestamp *
-+
-+# Increase the minimum number of selectable sources required to adjust
-+# the system clock.
-+#minsources 2
-+
-+# Allow NTP client access from local network.
-+#allow 192.168.0.0/16
-+
-+# Serve time even if not synchronized to a time source.
-+#local stratum 10
-+
-+# Specify file containing keys for NTP authentication.
-+#keyfile /etc/chrony.keys
-+
-+# Specify directory for log files.
-+logdir /var/log/chrony
-+
-+# Select which information is logged.
-+#log measurements statistics tracking
-diff --git a/templates/chrony.conf.cloudlinux.tmpl b/templates/chrony.conf.cloudlinux.tmpl
-new file mode 100644
-index 0000000..43b1f5d
---- /dev/null
-+++ b/templates/chrony.conf.cloudlinux.tmpl
-@@ -0,0 +1,51 @@
-+## template:jinja
-+# Use public servers from the pool.ntp.org project.
-+# Please consider joining the pool (http://www.pool.ntp.org/join.html).
-+{% if pools %}# pools
-+{% endif %}
-+{% for pool in pools -%}
-+pool {{pool}} iburst
-+{% endfor %}
-+{%- if servers %}# servers
-+{% endif %}
-+{% for server in servers -%}
-+server {{server}} iburst
-+{% endfor %}
-+{% for peer in peers -%}
-+peer {{peer}}
-+{% endfor %}
-+{% for a in allow -%}
-+allow {{a}}
-+{% endfor %}
-+
-+# Record the rate at which the system clock gains/losses time.
-+driftfile /var/lib/chrony/drift
-+
-+# Allow the system clock to be stepped in the first three updates
-+# if its offset is larger than 1 second.
-+makestep 1.0 3
-+
-+# Enable kernel synchronization of the real-time clock (RTC).
-+rtcsync
-+
-+# Enable hardware timestamping on all interfaces that support it.
-+#hwtimestamp *
-+
-+# Increase the minimum number of selectable sources required to adjust
-+# the system clock.
-+#minsources 2
-+
-+# Allow NTP client access from local network.
-+#allow 192.168.0.0/16
-+
-+# Serve time even if not synchronized to a time source.
-+#local stratum 10
-+
-+# Specify file containing keys for NTP authentication.
-+#keyfile /etc/chrony.keys
-+
-+# Specify directory for log files.
-+logdir /var/log/chrony
-+
-+# Select which information is logged.
-+#log measurements statistics tracking
-diff --git a/templates/ntp.conf.almalinux.tmpl b/templates/ntp.conf.almalinux.tmpl
-new file mode 100644
-index 0000000..9884df5
---- /dev/null
-+++ b/templates/ntp.conf.almalinux.tmpl
-@@ -0,0 +1,64 @@
-+## template:jinja
-+
-+# For more information about this file, see the man pages
-+# ntp.conf(5), ntp_acc(5), ntp_auth(5), ntp_clock(5), ntp_misc(5), ntp_mon(5).
-+
-+driftfile /var/lib/ntp/drift
-+
-+# Permit time synchronization with our time source, but do not
-+# permit the source to query or modify the service on this system.
-+restrict default kod nomodify notrap nopeer noquery
-+restrict -6 default kod nomodify notrap nopeer noquery
-+
-+# Permit all access over the loopback interface.  This could
-+# be tightened as well, but to do so would effect some of
-+# the administrative functions.
-+restrict 127.0.0.1 
-+restrict -6 ::1
-+
-+# Hosts on local network are less restricted.
-+#restrict 192.168.1.0 mask 255.255.255.0 nomodify notrap
-+
-+# Use public servers from the pool.ntp.org project.
-+# Please consider joining the pool (http://www.pool.ntp.org/join.html).
-+{% if pools %}# pools
-+{% endif %}
-+{% for pool in pools -%}
-+pool {{pool}} iburst
-+{% endfor %}
-+{%- if servers %}# servers
-+{% endif %}
-+{% for server in servers -%}
-+server {{server}} iburst
-+{% endfor %}
-+{% for peer in peers -%}
-+peer {{peer}}
-+{% endfor %}
-+
-+#broadcast 192.168.1.255 autokey	# broadcast server
-+#broadcastclient			# broadcast client
-+#broadcast 224.0.1.1 autokey		# multicast server
-+#multicastclient 224.0.1.1		# multicast client
-+#manycastserver 239.255.254.254		# manycast server
-+#manycastclient 239.255.254.254 autokey # manycast client
-+
-+# Enable public key cryptography.
-+#crypto
-+
-+includefile /etc/ntp/crypto/pw
-+
-+# Key file containing the keys and key identifiers used when operating
-+# with symmetric key cryptography. 
-+keys /etc/ntp/keys
-+
-+# Specify the key identifiers which are trusted.
-+#trustedkey 4 8 42
-+
-+# Specify the key identifier to use with the ntpdc utility.
-+#requestkey 8
-+
-+# Specify the key identifier to use with the ntpq utility.
-+#controlkey 8
-+
-+# Enable writing of statistics records.
-+#statistics clockstats cryptostats loopstats peerstats
-diff --git a/templates/ntp.conf.cloudlinux.tmpl b/templates/ntp.conf.cloudlinux.tmpl
-new file mode 100644
-index 0000000..9884df5
---- /dev/null
-+++ b/templates/ntp.conf.cloudlinux.tmpl
-@@ -0,0 +1,64 @@
-+## template:jinja
-+
-+# For more information about this file, see the man pages
-+# ntp.conf(5), ntp_acc(5), ntp_auth(5), ntp_clock(5), ntp_misc(5), ntp_mon(5).
-+
-+driftfile /var/lib/ntp/drift
-+
-+# Permit time synchronization with our time source, but do not
-+# permit the source to query or modify the service on this system.
-+restrict default kod nomodify notrap nopeer noquery
-+restrict -6 default kod nomodify notrap nopeer noquery
-+
-+# Permit all access over the loopback interface.  This could
-+# be tightened as well, but to do so would effect some of
-+# the administrative functions.
-+restrict 127.0.0.1 
-+restrict -6 ::1
-+
-+# Hosts on local network are less restricted.
-+#restrict 192.168.1.0 mask 255.255.255.0 nomodify notrap
-+
-+# Use public servers from the pool.ntp.org project.
-+# Please consider joining the pool (http://www.pool.ntp.org/join.html).
-+{% if pools %}# pools
-+{% endif %}
-+{% for pool in pools -%}
-+pool {{pool}} iburst
-+{% endfor %}
-+{%- if servers %}# servers
-+{% endif %}
-+{% for server in servers -%}
-+server {{server}} iburst
-+{% endfor %}
-+{% for peer in peers -%}
-+peer {{peer}}
-+{% endfor %}
-+
-+#broadcast 192.168.1.255 autokey	# broadcast server
-+#broadcastclient			# broadcast client
-+#broadcast 224.0.1.1 autokey		# multicast server
-+#multicastclient 224.0.1.1		# multicast client
-+#manycastserver 239.255.254.254		# manycast server
-+#manycastclient 239.255.254.254 autokey # manycast client
-+
-+# Enable public key cryptography.
-+#crypto
-+
-+includefile /etc/ntp/crypto/pw
-+
-+# Key file containing the keys and key identifiers used when operating
-+# with symmetric key cryptography. 
-+keys /etc/ntp/keys
-+
-+# Specify the key identifiers which are trusted.
-+#trustedkey 4 8 42
-+
-+# Specify the key identifier to use with the ntpdc utility.
-+#requestkey 8
-+
-+# Specify the key identifier to use with the ntpq utility.
-+#controlkey 8
-+
-+# Enable writing of statistics records.
-+#statistics clockstats cryptostats loopstats peerstats
--- 
-2.27.0
-

SOURCES/0003-Do-not-write-NM_CONTROLLED-no-in-generated-interface.patch

@@ -0,0 +1,550 @@
+From 2d3a22bd5b36c20b53f1604e9ff6ce05c98753ec Mon Sep 17 00:00:00 2001
+From: Cathy Avery <cavery@redhat.com>
+Date: Mon, 18 Dec 2023 12:54:16 -0500
+Subject: Do not write NM_CONTROLLED=no in generated interface config files
+
+Squashed from:
+    From 3ee57b044d2b85d8172961258d2edeab82a43772 Mon Sep 17 00:00:00 2001
+    From: Eduardo Otubo <otubo@redhat.com>
+    Date: Fri, 7 May 2021 13:36:06 +0200
+    Subject: [PATCH 02/12] Do not write NM_CONTROLLED=no in generated interface config files
+
+    From 3a070f23440c9eb6e0e5fb3605e36285e8a5b727 Mon Sep 17 00:00:00 2001
+    From: Ani Sinha <anisinha@redhat.com>
+    Date: Fri, 23 Jun 2023 16:54:24 +0530
+    Subject: [PATCH 27/51] test fixes: remove NM_CONTROLLED=no from tests
+    fixes: b3b96bff187e9 ("Do not write NM_CONTROLLED=no in generated interface config files")
+
+X-downstream-only: true
+
+Signed-off-by: Cathy Avery <cavery@redhat.com>
+---
+ cloudinit/net/sysconfig.py                    |  1 -
+ tests/unittests/cmd/devel/test_net_convert.py |  1 -
+ tests/unittests/distros/test_netconfig.py     |  8 ---
+ tests/unittests/test_net.py                   | 53 -------------------
+ 4 files changed, 63 deletions(-)
+
+diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
+index 7570a5e3..3b7a1f93 100644
+--- a/cloudinit/net/sysconfig.py
++++ b/cloudinit/net/sysconfig.py
+@@ -317,7 +317,6 @@ class Renderer(renderer.Renderer):
+         "rhel": {
+             "ONBOOT": True,
+             "USERCTL": False,
+-            "NM_CONTROLLED": False,
+             "BOOTPROTO": "none",
+         },
+         "suse": {"BOOTPROTO": "static", "STARTMODE": "auto"},
+diff --git a/tests/unittests/cmd/devel/test_net_convert.py b/tests/unittests/cmd/devel/test_net_convert.py
+index fb72963f..7b9121b2 100644
+--- a/tests/unittests/cmd/devel/test_net_convert.py
++++ b/tests/unittests/cmd/devel/test_net_convert.py
+@@ -62,7 +62,6 @@ SAMPLE_SYSCONFIG_CONTENT = """\
+ #
+ BOOTPROTO=dhcp
+ DEVICE=eth0
+-NM_CONTROLLED=no
+ ONBOOT=yes
+ TYPE=Ethernet
+ USERCTL=no
+diff --git a/tests/unittests/distros/test_netconfig.py b/tests/unittests/distros/test_netconfig.py
+index 7ba430f2..962ff7fb 100644
+--- a/tests/unittests/distros/test_netconfig.py
++++ b/tests/unittests/distros/test_netconfig.py
+@@ -723,7 +723,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
+                 GATEWAY=192.168.1.254
+                 IPADDR=192.168.1.5
+                 NETMASK=255.255.255.0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no
+@@ -733,7 +732,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
+                 """\
+                 BOOTPROTO=dhcp
+                 DEVICE=eth1
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no
+@@ -764,7 +762,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
+                 IPV6_AUTOCONF=no
+                 IPV6_DEFAULTGW=2607:f0d0:1002:0011::1
+                 IPV6_FORCE_ACCEPT_RA=no
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no
+@@ -774,7 +771,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
+                 """\
+                 BOOTPROTO=dhcp
+                 DEVICE=eth1
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no
+@@ -821,7 +817,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
+                 HWADDR=00:16:3e:60:7c:df
+                 IPADDR=192.10.1.2
+                 NETMASK=255.255.255.0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no
+@@ -833,7 +828,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
+                 DEVICE=infra0
+                 IPADDR=10.0.1.2
+                 NETMASK=255.255.0.0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 PHYSDEV=eth0
+                 USERCTL=no
+@@ -869,7 +863,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
+                 DEVICE=eth0
+                 IPADDR=192.10.1.2
+                 NETMASK=255.255.255.0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no
+@@ -881,7 +874,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
+                 DEVICE=eth0.1001
+                 IPADDR=10.0.1.2
+                 NETMASK=255.255.0.0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 PHYSDEV=eth0
+                 USERCTL=no
+diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
+index c5509536..052b0674 100644
+--- a/tests/unittests/test_net.py
++++ b/tests/unittests/test_net.py
+@@ -585,7 +585,6 @@ GATEWAY=172.19.3.254
+ HWADDR=fa:16:3e:ed:9a:59
+ IPADDR=172.19.1.34
+ NETMASK=255.255.252.0
+-NM_CONTROLLED=no
+ ONBOOT=yes
+ TYPE=Ethernet
+ USERCTL=no
+@@ -750,7 +749,6 @@ IPADDR=172.19.1.34
+ IPADDR1=10.0.0.10
+ NETMASK=255.255.252.0
+ NETMASK1=255.255.255.0
+-NM_CONTROLLED=no
+ ONBOOT=yes
+ TYPE=Ethernet
+ USERCTL=no
+@@ -912,7 +910,6 @@ IPV6_AUTOCONF=no
+ IPV6_DEFAULTGW=2001:DB8::1
+ IPV6_FORCE_ACCEPT_RA=no
+ NETMASK=255.255.252.0
+-NM_CONTROLLED=no
+ ONBOOT=yes
+ TYPE=Ethernet
+ USERCTL=no
+@@ -1143,7 +1140,6 @@ NETWORK_CONFIGS = {
+                 BOOTPROTO=none
+                 DEVICE=eth1
+                 HWADDR=cf:d6:af:48:e8:80
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no"""
+@@ -1162,7 +1158,6 @@ NETWORK_CONFIGS = {
+                 IPADDR=192.168.21.3
+                 NETMASK=255.255.255.0
+                 METRIC=10000
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no"""
+@@ -1319,7 +1314,6 @@ NETWORK_CONFIGS = {
+                 BOOTPROTO=none
+                 DEVICE=eth1
+                 HWADDR=cf:d6:af:48:e8:80
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no"""
+@@ -1338,7 +1332,6 @@ NETWORK_CONFIGS = {
+                 IPADDR=192.168.21.3
+                 NETMASK=255.255.255.0
+                 METRIC=10000
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no"""
+@@ -1581,7 +1574,6 @@ NETWORK_CONFIGS = {
+                 IPV6_AUTOCONF=no
+                 IPV6_FORCE_ACCEPT_RA=no
+                 NETMASK=255.255.255.0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no
+@@ -1725,7 +1717,6 @@ NETWORK_CONFIGS = {
+                 DHCPV6C=yes
+                 IPV6INIT=yes
+                 DEVICE=iface0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no
+@@ -1816,7 +1807,6 @@ NETWORK_CONFIGS = {
+                 IPV6INIT=yes
+                 IPV6_FORCE_ACCEPT_RA=yes
+                 DEVICE=iface0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no
+@@ -1892,7 +1882,6 @@ NETWORK_CONFIGS = {
+                 IPV6INIT=yes
+                 IPV6_FORCE_ACCEPT_RA=no
+                 DEVICE=iface0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no
+@@ -1956,7 +1945,6 @@ NETWORK_CONFIGS = {
+                 IPV6_AUTOCONF=yes
+                 IPV6INIT=yes
+                 DEVICE=iface0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no
+@@ -2014,7 +2002,6 @@ NETWORK_CONFIGS = {
+             IPV6_AUTOCONF=no
+             IPV6_FORCE_ACCEPT_RA=no
+             DEVICE=iface0
+-            NM_CONTROLLED=no
+             ONBOOT=yes
+             TYPE=Ethernet
+             USERCTL=no
+@@ -2071,7 +2058,6 @@ NETWORK_CONFIGS = {
+             IPV6_AUTOCONF=yes
+             IPV6INIT=yes
+             DEVICE=iface0
+-            NM_CONTROLLED=no
+             ONBOOT=yes
+             TYPE=Ethernet
+             USERCTL=no
+@@ -2157,7 +2143,6 @@ NETWORK_CONFIGS = {
+             IPV6_FAILURE_FATAL=yes
+             IPV6_FORCE_ACCEPT_RA=yes
+             DEVICE=iface0
+-            NM_CONTROLLED=no
+             ONBOOT=yes
+             TYPE=Ethernet
+             USERCTL=no
+@@ -2198,7 +2183,6 @@ NETWORK_CONFIGS = {
+                 """\
+                 BOOTPROTO=dhcp
+                 DEVICE=iface0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no
+@@ -2275,7 +2259,6 @@ NETWORK_CONFIGS = {
+                 BOOTPROTO=dhcp
+                 DEVICE=iface0
+                 ETHTOOL_OPTS="wol g"
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no
+@@ -2619,7 +2602,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+                 DHCPV6C=yes
+                 IPV6INIT=yes
+                 MACADDR=aa:bb:cc:dd:ee:ff
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Bond
+                 USERCTL=no"""
+@@ -2629,7 +2611,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+                 BOOTPROTO=dhcp
+                 DEVICE=bond0.200
+                 DHCLIENT_SET_DEFAULT_ROUTE=no
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 PHYSDEV=bond0
+                 USERCTL=no
+@@ -2649,7 +2630,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+                 IPV6_DEFAULTGW=2001:4800:78ff:1b::1
+                 MACADDR=bb:bb:bb:bb:bb:aa
+                 NETMASK=255.255.255.0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 PRIO=22
+                 STP=no
+@@ -2661,7 +2641,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+                 BOOTPROTO=none
+                 DEVICE=eth0
+                 HWADDR=c0:d6:9f:2c:e8:80
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no"""
+@@ -2680,7 +2659,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+                 MTU=1500
+                 NETMASK=255.255.255.0
+                 NETMASK1=255.255.255.0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 PHYSDEV=eth0
+                 USERCTL=no
+@@ -2692,7 +2670,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+                 DEVICE=eth1
+                 HWADDR=aa:d6:9f:2c:e8:80
+                 MASTER=bond0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 SLAVE=yes
+                 TYPE=Ethernet
+@@ -2704,7 +2681,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+                 DEVICE=eth2
+                 HWADDR=c0:bb:9f:2c:e8:80
+                 MASTER=bond0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 SLAVE=yes
+                 TYPE=Ethernet
+@@ -2716,7 +2692,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+                 BRIDGE=br0
+                 DEVICE=eth3
+                 HWADDR=66:bb:9f:2c:e8:80
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no"""
+@@ -2727,7 +2702,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+                 BRIDGE=br0
+                 DEVICE=eth4
+                 HWADDR=98:bb:9f:2c:e8:80
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no"""
+@@ -2738,7 +2712,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+                 DEVICE=eth5
+                 DHCLIENT_SET_DEFAULT_ROUTE=no
+                 HWADDR=98:bb:9f:2c:e8:8a
+-                NM_CONTROLLED=no
+                 ONBOOT=no
+                 TYPE=Ethernet
+                 USERCTL=no"""
+@@ -2751,7 +2724,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+                 IPADDR=192.168.200.7
+                 MTU=9000
+                 NETMASK=255.255.255.0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=InfiniBand
+                 USERCTL=no"""
+@@ -3473,7 +3445,6 @@ iface bond0 inet6 static
+         MTU=9000
+         NETMASK=255.255.255.0
+         NETMASK1=255.255.255.0
+-        NM_CONTROLLED=no
+         ONBOOT=yes
+         TYPE=Bond
+         USERCTL=no
+@@ -3485,7 +3456,6 @@ iface bond0 inet6 static
+         DEVICE=bond0s0
+         HWADDR=aa:bb:cc:dd:e8:00
+         MASTER=bond0
+-        NM_CONTROLLED=no
+         ONBOOT=yes
+         SLAVE=yes
+         TYPE=Ethernet
+@@ -3513,7 +3483,6 @@ iface bond0 inet6 static
+         DEVICE=bond0s1
+         HWADDR=aa:bb:cc:dd:e8:01
+         MASTER=bond0
+-        NM_CONTROLLED=no
+         ONBOOT=yes
+         SLAVE=yes
+         TYPE=Ethernet
+@@ -3662,7 +3631,6 @@ iface bond0 inet6 static
+                 BOOTPROTO=none
+                 DEVICE=en0
+                 HWADDR=aa:bb:cc:dd:e8:00
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no"""
+@@ -3683,7 +3651,6 @@ iface bond0 inet6 static
+                 MTU=2222
+                 NETMASK=255.255.255.0
+                 NETMASK1=255.255.255.0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 PHYSDEV=en0
+                 USERCTL=no
+@@ -3811,7 +3778,6 @@ iface bond0 inet6 static
+                 DEVICE=br0
+                 IPADDR=192.168.2.2
+                 NETMASK=255.255.255.0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 PRIO=22
+                 STP=no
+@@ -3829,7 +3795,6 @@ iface bond0 inet6 static
+                 IPV6INIT=yes
+                 IPV6_AUTOCONF=no
+                 IPV6_FORCE_ACCEPT_RA=no
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no
+@@ -3845,7 +3810,6 @@ iface bond0 inet6 static
+                 IPV6INIT=yes
+                 IPV6_AUTOCONF=no
+                 IPV6_FORCE_ACCEPT_RA=no
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no
+@@ -4030,7 +3994,6 @@ iface bond0 inet6 static
+                 HWADDR=52:54:00:12:34:00
+                 IPADDR=192.168.1.2
+                 NETMASK=255.255.255.0
+-                NM_CONTROLLED=no
+                 ONBOOT=no
+                 TYPE=Ethernet
+                 USERCTL=no
+@@ -4042,7 +4005,6 @@ iface bond0 inet6 static
+                 DEVICE=eth1
+                 HWADDR=52:54:00:12:34:aa
+                 MTU=1480
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no
+@@ -4053,7 +4015,6 @@ iface bond0 inet6 static
+                 BOOTPROTO=none
+                 DEVICE=eth2
+                 HWADDR=52:54:00:12:34:ff
+-                NM_CONTROLLED=no
+                 ONBOOT=no
+                 TYPE=Ethernet
+                 USERCTL=no
+@@ -4138,7 +4099,6 @@ iface bond0 inet6 static
+                 BOOTPROTO=none
+                 DEVICE=eth0
+                 HWADDR=cf:d6:af:48:e8:80
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no"""
+@@ -4736,7 +4696,6 @@ class TestRhelSysConfigRendering(CiTestCase):
+ BOOTPROTO=dhcp
+ DEVICE=eth1000
+ HWADDR=07-1c-c6-75-a4-be
+-NM_CONTROLLED=no
+ ONBOOT=yes
+ TYPE=Ethernet
+ USERCTL=no
+@@ -4948,7 +4907,6 @@ GATEWAY=10.0.2.2
+ HWADDR=52:54:00:12:34:00
+ IPADDR=10.0.2.15
+ NETMASK=255.255.255.0
+-NM_CONTROLLED=no
+ ONBOOT=yes
+ TYPE=Ethernet
+ USERCTL=no
+@@ -4979,7 +4937,6 @@ HWADDR=fa:16:3e:25:b4:59
+ IPADDR=51.68.89.122
+ MTU=1500
+ NETMASK=255.255.240.0
+-NM_CONTROLLED=no
+ ONBOOT=yes
+ TYPE=Ethernet
+ USERCTL=no
+@@ -4993,7 +4950,6 @@ DEVICE=eth1
+ DHCLIENT_SET_DEFAULT_ROUTE=no
+ HWADDR=fa:16:3e:b1:ca:29
+ MTU=9000
+-NM_CONTROLLED=no
+ ONBOOT=yes
+ TYPE=Ethernet
+ USERCTL=no
+@@ -5018,7 +4974,6 @@ USERCTL=no
+ #
+ BOOTPROTO=dhcp
+ DEVICE=eth0
+-NM_CONTROLLED=no
+ ONBOOT=yes
+ TYPE=Ethernet
+ USERCTL=no
+@@ -5251,7 +5206,6 @@ USERCTL=no
+                    IPV6_FORCE_ACCEPT_RA=no
+                    IPV6_DEFAULTGW=2001:db8::1
+                    NETMASK=255.255.255.0
+-                   NM_CONTROLLED=no
+                    ONBOOT=yes
+                    TYPE=Ethernet
+                    USERCTL=no
+@@ -5283,7 +5237,6 @@ USERCTL=no
+                 """\
+                 BOOTPROTO=none
+                 DEVICE=eno1
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no
+@@ -5296,7 +5249,6 @@ USERCTL=no
+                 IPADDR=192.6.1.9
+                 MTU=1495
+                 NETMASK=255.255.255.0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 PHYSDEV=eno1
+                 USERCTL=no
+@@ -5332,7 +5284,6 @@ USERCTL=no
+                 IPADDR=10.101.8.65
+                 MTU=1334
+                 NETMASK=255.255.255.192
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Bond
+                 USERCTL=no
+@@ -5344,7 +5295,6 @@ USERCTL=no
+                 BOOTPROTO=none
+                 DEVICE=enp0s0
+                 MASTER=bond0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 SLAVE=yes
+                 TYPE=Bond
+@@ -5357,7 +5307,6 @@ USERCTL=no
+                 BOOTPROTO=none
+                 DEVICE=enp0s1
+                 MASTER=bond0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 SLAVE=yes
+                 TYPE=Bond
+@@ -5388,7 +5337,6 @@ USERCTL=no
+                 DEVICE=eno1
+                 HWADDR=07-1c-c6-75-a4-be
+                 METRIC=100
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no
+@@ -5479,7 +5427,6 @@ USERCTL=no
+                 IPV6_FORCE_ACCEPT_RA=no
+                 MTU=1400
+                 NETMASK=255.255.248.0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no
+-- 
+2.41.0
+

SOURCES/0004-include-NOZEROCONF-yes-in-etc-sysconfig-network.patch

@@ -0,0 +1,53 @@
+From fea3e7fc6d23e988cf4a33dc03064ff31bf1d72d Mon Sep 17 00:00:00 2001
+From: Eduardo Otubo <otubo@redhat.com>
+Date: Fri, 7 May 2021 13:36:13 +0200
+Subject: include 'NOZEROCONF=yes' in /etc/sysconfig/network
+
+RH-Author: Eduardo Otubo <otubo@redhat.com>
+Message-id: <20190320114559.23708-1-otubo@redhat.com>
+Patchwork-id: 84937
+O-Subject: [RHEL-7.7 cloud-init PATCH] include 'NOZEROCONF=yes' in /etc/sysconfig/network
+Bugzilla: 1653131
+RH-Acked-by: Cathy Avery <cavery@redhat.com>
+RH-Acked-by: Mohammed Gamal <mgamal@redhat.com>
+RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
+
+The option NOZEROCONF=yes is not included by default in
+/etc/sysconfig/network, which is required by Overcloud instances. The
+patch also includes tests for the modifications.
+
+X-downstream-only: yes
+Resolves: rhbz#1653131
+
+Signed-off-by: Eduardo Otubo <otubo@redhat.com>
+Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
+(cherry picked from commit ffa647e83efd4293bd027e9e390274aad8a12d94)
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+Signed-off-by: Cathy Avery <cavery@redhat.com>
+---
+ cloudinit/net/sysconfig.py | 11 ++++++++++-
+ redhat/scripts/frh.py      | 10 +++++++---
+ 2 files changed, 17 insertions(+), 4 deletions(-)
+
+diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
+index 3b7a1f93..f01c4236 100644
+--- a/cloudinit/net/sysconfig.py
++++ b/cloudinit/net/sysconfig.py
+@@ -1029,7 +1029,16 @@ class Renderer(renderer.Renderer):
+         # Distros configuring /etc/sysconfig/network as a file e.g. Centos
+         if sysconfig_path.endswith("network"):
+             util.ensure_dir(os.path.dirname(sysconfig_path))
+-            netcfg = [_make_header(), "NETWORKING=yes"]
++            netcfg = []
++            for line in util.load_file(sysconfig_path, quiet=True).split("\n"):
++                if "cloud-init" in line:
++                    break
++                if not line.startswith(
++                    ("NETWORKING=", "IPV6_AUTOCONF=", "NETWORKING_IPV6=")
++                ):
++                    netcfg.append(line)
++            # Now generate the cloud-init portion of sysconfig/network
++            netcfg.extend([_make_header(), "NETWORKING=yes"])
+             if network_state.use_ipv6:
+                 netcfg.append("NETWORKING_IPV6=yes")
+                 netcfg.append("IPV6_AUTOCONF=no")

SOURCES/0005-settings.py-update-settings-for-rhel.patch

@@ -0,0 +1,83 @@
+From f7236c817aee8c39223cca88deb8341b4f2b5dfa Mon Sep 17 00:00:00 2001
+From: Cathy Avery <cavery@redhat.com>
+Date: Mon, 18 Dec 2023 14:13:19 -0500
+Subject: settings.py: update settings for rhel
+
+    commit 2bf34313f2e9599e3304b5446411b5ada6ccd7f0
+    Author: Ani Sinha <anisinha@redhat.com>
+    Date:   Tue Apr 11 04:20:00 2023 -0400
+    Please see commit 5e1e568d7085fd4443
+
+(" Add initial redhat setup")
+from rhel8.8.0 branch for setings.py. Applying the same for the rebased
+cloud-init.
+
+X-downstream-only: true
+
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+
+Conflicts: "def_log_file_mode": 0o600 as commit
+130899115 'limit permissions on def_log_file' was not applied.
+
+Signed-off-by: Cathy Avery <cavery@redhat.com>
+---
+ cloudinit/settings.py            |  7 +++++--
+ tests/unittests/cmd/test_main.py | 17 +++++++++++------
+ 2 files changed, 16 insertions(+), 8 deletions(-)
+
+diff --git a/cloudinit/settings.py b/cloudinit/settings.py
+index 592e144d..87829ff0 100644
+--- a/cloudinit/settings.py
++++ b/cloudinit/settings.py
+@@ -54,13 +54,16 @@ CFG_BUILTIN = {
+     ],
+     "def_log_file": "/var/log/cloud-init.log",
+     "log_cfgs": [],
+-    "syslog_fix_perms": ["syslog:adm", "root:adm", "root:wheel", "root:root"],
++    "syslog_fix_perms": [],
++    "mount_default_fields": [None, None, "auto", "defaults,nofail", "0", "2"],
++    "ssh_deletekeys": False,
++    "ssh_genkeytypes": [],
+     "system_info": {
+         "paths": {
+             "cloud_dir": "/var/lib/cloud",
+             "templates_dir": "/etc/cloud/templates/",
+         },
+-        "distro": "ubuntu",
++        "distro": "rhel",
+         "network": {"renderers": None},
+     },
+     "vendor_data": {"enabled": True, "prefix": []},
+diff --git a/tests/unittests/cmd/test_main.py b/tests/unittests/cmd/test_main.py
+index ab427115..c8c2ae81 100644
+--- a/tests/unittests/cmd/test_main.py
++++ b/tests/unittests/cmd/test_main.py
+@@ -119,14 +119,19 @@ class TestMain(FilesystemMockingTestCase):
+                 {
+                     "def_log_file": "/var/log/cloud-init.log",
+                     "log_cfgs": [],
+-                    "syslog_fix_perms": [
+-                        "syslog:adm",
+-                        "root:adm",
+-                        "root:wheel",
+-                        "root:root",
+-                    ],
+                     "vendor_data": {"enabled": True, "prefix": []},
+                     "vendor_data2": {"enabled": True, "prefix": []},
++                    "syslog_fix_perms": [],
++                    "ssh_deletekeys": False,
++                    "ssh_genkeytypes": [],
++                    "mount_default_fields": [
++                        None,
++                        None,
++                        "auto",
++                        "defaults,nofail",
++                        "0",
++                        "2",
++                    ],
+                 }
+             )
+             updated_cfg.pop("system_info")
+-- 
+2.41.0
+

SOURCES/0013-rhel-cloud.cfg-remove-ssh_genkeytypes-in-settings.py.patch

@@ -0,0 +1,98 @@
+From 77585bbc6d01399ff88865b55dfb7a47b8640271 Mon Sep 17 00:00:00 2001
+From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+Date: Thu, 20 May 2021 08:53:55 +0200
+Subject: rhel/cloud.cfg: remove ssh_genkeytypes in settings.py and set in
+ cloud.cfg
+
+RH-Author: Ani Sinha <None>
+RH-MergeRequest: 113: rhel/cloud.cfg: remove ssh_genkeytypes in settings.py and set in cloud.cfg
+RH-Jira: RHEL-16572
+RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Commit: [1/1] f506bf58dc5458f50624342ec33bcd390aa0b719 (anisinha/rhel-cloud-init)
+
+RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-MergeRequest: 10: rhel/cloud.cfg: remove ssh_genkeytypes in settings.py and set in cloud.cfg
+RH-Commit: [1/1] 6da989423b9b6e017afbac2f1af3649b0487310f
+RH-Bugzilla: 1957532
+RH-Acked-by: Eduardo Otubo <otubo@redhat.com>
+RH-Acked-by: Cathy Avery <cavery@redhat.com>
+RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
+RH-Acked-by: Mohamed Gamal Morsy <mmorsy@redhat.com>
+
+Currently genkeytypes in cloud.cfg is set to None, so together with
+ssh_deletekeys=1 cloudinit on first boot it will just delete the existing
+keys and not generate new ones.
+
+Just removing that property in cloud.cfg is not enough, because
+settings.py provides another empty default value that will be used
+instead, resulting to no key generated even when the property is not defined.
+
+Removing genkeytypes also in settings.py will default to GENERATE_KEY_NAMES,
+but since we want only 'rsa', 'ecdsa' and 'ed25519', add back genkeytypes in
+cloud.cfg with the above defaults.
+
+Also remove ssh_deletekeys in settings.py as we always need
+to 1 (and it also defaults to 1).
+
+Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+(cherry picked from commit b545a0cbabe8924d048b7172b30e7aad59ed32d5)
+(cherry picked from commit 855dec5dcc0892c0f7cedf06b025a794769a2a8d)
+
+Fix unit test breakage
+
+Fix unit test breakage due to the downstream change
+5d6674508c6478fa2c ("rhel/cloud.cfg: remove ssh_genkeytypes in settings.py and set in cloud.cfg")
+
+X-downstream-only: true
+Fixes: 5d6674508c6478fa2c ("rhel/cloud.cfg: remove ssh_genkeytypes in settings.py and set in cloud.cfg")
+
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+
+Squashed:
+    commit 1afec9e6008db187d1b675e4473d5a2bf0b3c36b
+    Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+    Date:   Thu May 20 08:53:55 2021 +0200
+    Subject: [PATCH 49/51] rhel/cloud.cfg: remove ssh_genkeytypes in settings.py
+             and set in cloud.cfg
+
+    From fe6fb1843fe8df75899fe189b9e5f8ce3cd75be1 Mon Sep 17 00:00:00 2001
+    From: Ani Sinha <anisinha@redhat.com>
+    Date: Fri, 8 Dec 2023 12:50:15 +0530
+    Subject: [PATCH 51/51] Fix unit test breakage
+
+Signed-off-by: Cathy Avery <cavery@redhat.com>
+---
+ cloudinit/settings.py            | 2 --
+ tests/unittests/cmd/test_main.py | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/cloudinit/settings.py b/cloudinit/settings.py
+index 87829ff0..3a581e5b 100644
+--- a/cloudinit/settings.py
++++ b/cloudinit/settings.py
+@@ -56,8 +56,6 @@ CFG_BUILTIN = {
+     "log_cfgs": [],
+     "syslog_fix_perms": [],
+     "mount_default_fields": [None, None, "auto", "defaults,nofail", "0", "2"],
+-    "ssh_deletekeys": False,
+-    "ssh_genkeytypes": [],
+     "system_info": {
+         "paths": {
+             "cloud_dir": "/var/lib/cloud",
+diff --git a/tests/unittests/cmd/test_main.py b/tests/unittests/cmd/test_main.py
+index c8c2ae81..19d26ebe 100644
+--- a/tests/unittests/cmd/test_main.py
++++ b/tests/unittests/cmd/test_main.py
+@@ -122,8 +122,6 @@ class TestMain(FilesystemMockingTestCase):
+                     "vendor_data": {"enabled": True, "prefix": []},
+                     "vendor_data2": {"enabled": True, "prefix": []},
+                     "syslog_fix_perms": [],
+-                    "ssh_deletekeys": False,
+-                    "ssh_genkeytypes": [],
+                     "mount_default_fields": [
+                         None,
+                         None,
+-- 
+2.41.0
+

SOURCES/ci-Retain-exit-code-in-cloud-init-status-for-recoverabl.patch

@@ -0,0 +1,65 @@
+From 9da40a7e46e40eb090538f9d8a5aa6049fbbc5b8 Mon Sep 17 00:00:00 2001
+From: Ani Sinha <anisinha@redhat.com>
+Date: Tue, 12 Mar 2024 12:52:10 +0530
+Subject: [PATCH] Retain exit code in cloud-init status for recoverable errors
+
+RH-Author: Ani Sinha <None>
+RH-MergeRequest: 126: Retain exit code in cloud-init status for recoverable errors
+RH-Jira: RHEL-28817
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Acked-by: Cathy Avery <cavery@redhat.com>
+RH-Commit: [1/1] 8c45ffe77ed8e964c35af4705d65daaf8282038f
+
+Version 23.4 of cloud-init changed the status code reported by cloud-init for
+recoverable errors from 0 to 2. Please see the commit
+70acb7f2a30d58 ("Add support for cloud-init "degraded" state (#4500)")
+
+This change has the potential to break customers who are expecting a 0 status
+and where warnings can be expected. Hence, revert the status code from 2 to 0
+even in case of recoverable errors. This retains the old behavior and hence
+avoids breaking scripts and software stack that expects 0 on the end user side.
+
+Cannonical has made a similar change downstream for similar reasons. Please see
+https://bugs.launchpad.net/ubuntu/+source/cloud-init/+bug/2048522
+and the corresponding downstream patch:
+https://github.com/canonical/cloud-init/pull/4747/commits/adce34bfd214e4eecdf87329486f30f0898dd303
+
+This patch has limited risk as it narrowly only restores the old status
+code for recoverable errors and does not modify anything else.
+
+X-downstream-only: true
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+---
+ cloudinit/cmd/status.py            | 2 +-
+ tests/unittests/cmd/test_status.py | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cloudinit/cmd/status.py b/cloudinit/cmd/status.py
+index f5ee9c11..849c80bc 100644
+--- a/cloudinit/cmd/status.py
++++ b/cloudinit/cmd/status.py
+@@ -225,7 +225,7 @@ def handle_status_args(name, args) -> int:
+         return 1
+     # Recoverable error
+     elif details.status in UXAppStatusDegradedMap.values():
+-        return 2
++        return 0
+     return 0
+ 
+ 
+diff --git a/tests/unittests/cmd/test_status.py b/tests/unittests/cmd/test_status.py
+index 6c85a59a..567b517a 100644
+--- a/tests/unittests/cmd/test_status.py
++++ b/tests/unittests/cmd/test_status.py
+@@ -636,7 +636,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin
+                 },
+                 None,
+                 MyArgs(long=False, wait=False, format="json"),
+-                2,
++                0,
+                 {
+                     "boot_status_code": "enabled-by-kernel-cmdline",
+                     "datasource": "nocloud",
+-- 
+2.39.3
+

SOURCES/ci-Revert-Use-grep-for-faster-parsing-of-cloud-config-i.patch

@@ -0,0 +1,242 @@
+From ce17b057e4bd5dfaa2cc72991736a1b82704488c Mon Sep 17 00:00:00 2001
+From: Brett Holman <brett.holman@canonical.com>
+Date: Tue, 23 Jan 2024 11:47:35 -0700
+Subject: [PATCH] Revert "Use grep for faster parsing of cloud config in
+ ds-identify (#4327)"
+
+RH-Author: Ani Sinha <None>
+RH-MergeRequest: 122: Revert "Use grep for faster parsing of cloud config in ds-identify (#4327)"
+RH-Jira: RHEL-22248
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Acked-by: Jon Maloy <jmaloy@redhat.com>
+RH-Commit: [1/1] f14ebd0055aad9340249e83381cf976debdbe38d
+
+This reverts commit 816e05d4830f5e789f1f85ef926e2849156bff3a.
+
+Reopens LP: 2030729
+Fixes GH-4794
+
+(cherry picked from commit 8ff94fe9493ad88344eb8bbf2f023c6ba2db5206)
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+---
+ tests/unittests/test_ds_identify.py | 146 +---------------------------
+ tools/ds-identify                   |  31 +++---
+ 2 files changed, 15 insertions(+), 162 deletions(-)
+
+diff --git a/tests/unittests/test_ds_identify.py b/tests/unittests/test_ds_identify.py
+index ca206fb5..ba0bf779 100644
+--- a/tests/unittests/test_ds_identify.py
++++ b/tests/unittests/test_ds_identify.py
+@@ -57,146 +57,6 @@ BLKID_UEFI_UBUNTU = [
+ ]
+ 
+ 
+-DEFAULT_CLOUD_CONFIG = """\
+-# The top level settings are used as module
+-# and base configuration.
+-# A set of users which may be applied and/or used by various modules
+-# when a 'default' entry is found it will reference the 'default_user'
+-# from the distro configuration specified below
+-users:
+-   - default
+-
+-# If this is set, 'root' will not be able to ssh in and they
+-# will get a message to login instead as the default $user
+-disable_root: true
+-
+-# This will cause the set+update hostname module to not operate (if true)
+-preserve_hostname: false
+-
+-# If you use datasource_list array, keep array items in a single line.
+-# If you use multi line array, ds-identify script won't read array items.
+-# Example datasource config
+-# datasource:
+-#    Ec2:
+-#      metadata_urls: [ 'blah.com' ]
+-#      timeout: 5 # (defaults to 50 seconds)
+-#      max_wait: 10 # (defaults to 120 seconds)
+-
+-# The modules that run in the 'init' stage
+-cloud_init_modules:
+- - migrator
+- - seed_random
+- - bootcmd
+- - write-files
+- - growpart
+- - resizefs
+- - disk_setup
+- - mounts
+- - set_hostname
+- - update_hostname
+- - update_etc_hosts
+- - ca-certs
+- - rsyslog
+- - users-groups
+- - ssh
+-
+-# The modules that run in the 'config' stage
+-cloud_config_modules:
+- - wireguard
+- - snap
+- - ubuntu_autoinstall
+- - ssh-import-id
+- - keyboard
+- - locale
+- - set-passwords
+- - grub-dpkg
+- - apt-pipelining
+- - apt-configure
+- - ubuntu-advantage
+- - ntp
+- - timezone
+- - disable-ec2-metadata
+- - runcmd
+- - byobu
+-
+-# The modules that run in the 'final' stage
+-cloud_final_modules:
+- - package-update-upgrade-install
+- - fan
+- - landscape
+- - lxd
+- - ubuntu-drivers
+- - write-files-deferred
+- - puppet
+- - chef
+- - ansible
+- - mcollective
+- - salt-minion
+- - reset_rmc
+- - refresh_rmc_and_interface
+- - rightscale_userdata
+- - scripts-vendor
+- - scripts-per-once
+- - scripts-per-boot
+- - scripts-per-instance
+- - scripts-user
+- - ssh-authkey-fingerprints
+- - keys-to-console
+- - install-hotplug
+- - phone-home
+- - final-message
+- - power-state-change
+-
+-# System and/or distro specific settings
+-# (not accessible to handlers/transforms)
+-system_info:
+-   # This will affect which distro class gets used
+-   distro: ubuntu
+-   # Default user name + that default users groups (if added/used)
+-   default_user:
+-     name: ubuntu
+-     lock_passwd: True
+-     gecos: Ubuntu
+-     groups: [adm, audio, cdrom, floppy, lxd, netdev, plugdev, sudo, video]
+-     sudo: ["ALL=(ALL) NOPASSWD:ALL"]
+-     shell: /bin/bash
+-   network:
+-     renderers: ['netplan', 'eni', 'sysconfig']
+-     activators: ['netplan', 'eni', 'network-manager', 'networkd']
+-   # Automatically discover the best ntp_client
+-   ntp_client: auto
+-   # Other config here will be given to the distro class and/or path classes
+-   paths:
+-      cloud_dir: /var/lib/cloud/
+-      templates_dir: /etc/cloud/templates/
+-   package_mirrors:
+-     - arches: [i386, amd64]
+-       failsafe:
+-         primary: http://archive.ubuntu.com/ubuntu
+-         security: http://security.ubuntu.com/ubuntu
+-       search:
+-         primary:
+-           - http://%(ec2_region)s.ec2.archive.ubuntu.com/ubuntu/
+-           - http://%(availability_zone)s.clouds.archive.ubuntu.com/ubuntu/
+-           - http://%(region)s.clouds.archive.ubuntu.com/ubuntu/
+-         security: []
+-     - arches: [arm64, armel, armhf]
+-       failsafe:
+-         primary: http://ports.ubuntu.com/ubuntu-ports
+-         security: http://ports.ubuntu.com/ubuntu-ports
+-       search:
+-         primary:
+-           - http://%(ec2_region)s.ec2.ports.ubuntu.com/ubuntu-ports/
+-           - http://%(availability_zone)s.clouds.ports.ubuntu.com/ubuntu-ports/
+-           - http://%(region)s.clouds.ports.ubuntu.com/ubuntu-ports/
+-         security: []
+-     - arches: [default]
+-       failsafe:
+-         primary: http://ports.ubuntu.com/ubuntu-ports
+-         security: http://ports.ubuntu.com/ubuntu-ports
+-   ssh_svcname: ssh
+-"""
+-
+ POLICY_FOUND_ONLY = "search,found=all,maybe=none,notfound=disabled"
+ POLICY_FOUND_OR_MAYBE = "search,found=all,maybe=all,notfound=disabled"
+ DI_DEFAULT_POLICY = "search,found=all,maybe=all,notfound=disabled"
+@@ -279,10 +139,6 @@ class DsIdentifyBase(CiTestCase):
+         if files is None:
+             files = {}
+ 
+-        cloudcfg = "etc/cloud/cloud.cfg"
+-        if cloudcfg not in files:
+-            files[cloudcfg] = DEFAULT_CLOUD_CONFIG
+-
+         if rootd is None:
+             rootd = self.tmp_dir()
+ 
+@@ -1305,7 +1161,7 @@ VALID_CFG = {
+             # Also include a datasource list of more than just
+             # [NoCloud, None], because that would automatically select
+             # NoCloud without checking
+-            "etc/cloud/cloud.cfg": dedent(
++            "/etc/cloud/cloud.cfg": dedent(
+                 """\
+                 datasource_list: [ Azure, Openstack, NoCloud, None ]
+                 datasource:
+diff --git a/tools/ds-identify b/tools/ds-identify
+index 7a537278..ec2cc18a 100755
+--- a/tools/ds-identify
++++ b/tools/ds-identify
+@@ -777,24 +777,21 @@ check_config() {
+     if [ "$1" = "$files" -a ! -f "$1" ]; then
+         return 1
+     fi
+-    local line="" ret="" found=0 found_fn="" oifs="$IFS" out=""
+-    out=$(grep "$key\"\?:" "$@" 2>/dev/null)
+-    IFS=${CR}
+-    for line in $out; do
+-        # drop '# comment'
+-        line=${line%%#*}
+-        # if more than one file was 'grep'ed, then grep will output filename:
+-        # but if only one file, line will not be prefixed.
+-        if [ $# -eq 1 ]; then
+-            found_fn="$1"
+-        else
+-            found_fn="${line%%:*}"
+-            line=${line#*:}
+-        fi
+-        ret=${line#*: };
+-        found=$((found+1))
++    local fname="" line="" ret="" found=0 found_fn=""
++    # shellcheck disable=2094
++    for fname in "$@"; do
++        [ -f "$fname" ] || continue
++        while read line; do
++            line=${line%%#*}
++            case "$line" in
++                $key:\ *|"${key}":)
++                    ret=${line#*:};
++                    ret=${ret# };
++                    found=$((found+1))
++                    found_fn="$fname";;
++            esac
++        done <"$fname"
+     done
+-    IFS="$oifs"
+     if [ $found -ne 0 ]; then
+         _RET="$ret"
+         _RET_fname="$found_fn"
+-- 
+2.41.0
+

SOURCES/ci-Revert-systemd-Standardize-cloud-init-systemd-enable.patch

@@ -0,0 +1,108 @@
+From 42aad98557bb62ae693f38e5f1e137bcc44f6046 Mon Sep 17 00:00:00 2001
+From: Ani Sinha <anisinha@redhat.com>
+Date: Tue, 5 Mar 2024 12:42:26 +0530
+Subject: [PATCH] Revert "systemd: Standardize cloud-init systemd enablement
+ (#4399)"
+
+RH-Author: Ani Sinha <None>
+RH-MergeRequest: 124: Revert "systemd: Standardize cloud-init systemd enablement (#4399)"
+RH-Jira: RHEL-21290
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Acked-by: Cathy Avery <cavery@redhat.com>
+RH-Commit: [1/1] 10da53e761e25ff7d254a4cfb8fb1fd18de8b4ed
+
+This reverts commit ec7dde8041d4023b09324e84abe37dc766ebbaf6.
+
+'ConditionEnvironment' clause is not available in RHEL 8.10 systemd and adding
+the feature would be complicated. Hence reverting the patch seems to be the
+right thing to do as it was a simple enhancement to make sure all distros use
+systemd's kernel commandline and file conditionals. We only care about RHEL so
+the change should not affect us.
+
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+---
+ systemd/cloud-config.service.tmpl     | 3 ++-
+ systemd/cloud-final.service.tmpl      | 3 ++-
+ systemd/cloud-init-local.service.tmpl | 3 ++-
+ systemd/cloud-init.service.tmpl       | 3 ++-
+ systemd/cloud-init.target             | 3 ---
+ 5 files changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/systemd/cloud-config.service.tmpl b/systemd/cloud-config.service.tmpl
+index 31d9d983..76e50ae1 100644
+--- a/systemd/cloud-config.service.tmpl
++++ b/systemd/cloud-config.service.tmpl
+@@ -5,9 +5,10 @@ After=network-online.target cloud-config.target
+ After=snapd.seeded.service
+ Before=systemd-user-sessions.service
+ Wants=network-online.target cloud-config.target
++{% if variant == "rhel" %}
+ ConditionPathExists=!/etc/cloud/cloud-init.disabled
+ ConditionKernelCommandLine=!cloud-init=disabled
+-ConditionEnvironment=!KERNEL_CMDLINE=cloud-init=disabled
++{% endif %}
+ 
+ [Service]
+ Type=oneshot
+diff --git a/systemd/cloud-final.service.tmpl b/systemd/cloud-final.service.tmpl
+index bcf8b009..85f423ac 100644
+--- a/systemd/cloud-final.service.tmpl
++++ b/systemd/cloud-final.service.tmpl
+@@ -7,9 +7,10 @@ After=multi-user.target
+ Before=apt-daily.service
+ {% endif %}
+ Wants=network-online.target cloud-config.service
++{% if variant == "rhel" %}
+ ConditionPathExists=!/etc/cloud/cloud-init.disabled
+ ConditionKernelCommandLine=!cloud-init=disabled
+-ConditionEnvironment=!KERNEL_CMDLINE=cloud-init=disabled
++{% endif %}
+ 
+ 
+ [Service]
+diff --git a/systemd/cloud-init-local.service.tmpl b/systemd/cloud-init-local.service.tmpl
+index 3a1ca7fa..6f3f9d8d 100644
+--- a/systemd/cloud-init-local.service.tmpl
++++ b/systemd/cloud-init-local.service.tmpl
+@@ -26,9 +26,10 @@ Before=sysinit.target
+ Conflicts=shutdown.target
+ {% endif %}
+ RequiresMountsFor=/var/lib/cloud
++{% if variant == "rhel" %}
+ ConditionPathExists=!/etc/cloud/cloud-init.disabled
+ ConditionKernelCommandLine=!cloud-init=disabled
+-ConditionEnvironment=!KERNEL_CMDLINE=cloud-init=disabled
++{% endif %}
+ 
+ [Service]
+ Type=oneshot
+diff --git a/systemd/cloud-init.service.tmpl b/systemd/cloud-init.service.tmpl
+index bf91164a..26d2e39c 100644
+--- a/systemd/cloud-init.service.tmpl
++++ b/systemd/cloud-init.service.tmpl
+@@ -38,9 +38,10 @@ Conflicts=shutdown.target
+ Before=shutdown.target
+ Conflicts=shutdown.target
+ {% endif %}
++{% if variant == "rhel" %}
+ ConditionPathExists=!/etc/cloud/cloud-init.disabled
+ ConditionKernelCommandLine=!cloud-init=disabled
+-ConditionEnvironment=!KERNEL_CMDLINE=cloud-init=disabled
++{% endif %}
+ 
+ [Service]
+ Type=oneshot
+diff --git a/systemd/cloud-init.target b/systemd/cloud-init.target
+index 30450f7f..760dfee5 100644
+--- a/systemd/cloud-init.target
++++ b/systemd/cloud-init.target
+@@ -10,6 +10,3 @@
+ [Unit]
+ Description=Cloud-init target
+ After=multi-user.target
+-ConditionPathExists=!/etc/cloud/cloud-init.disabled
+-ConditionKernelCommandLine=!cloud-init=disabled
+-ConditionEnvironment=!KERNEL_CMDLINE=cloud-init=disabled
+-- 
+2.39.3
+

SOURCES/ci-ci-Pin-pytest-8.0.0.-4816.patch

@@ -0,0 +1,51 @@
+From 3f138f68a36224dcefd5c16befbc00486b09c8ec Mon Sep 17 00:00:00 2001
+From: Brett Holman <brett.holman@canonical.com>
+Date: Mon, 29 Jan 2024 12:03:36 -0700
+Subject: [PATCH 1/2] ci: Pin pytest<8.0.0. (#4816)
+
+RH-Author: Cathy Avery <cavery@redhat.com>
+RH-MergeRequest: 123: fix: Add types to network v1 schema (#4841)
+RH-Jira: RHEL-21323
+RH-Acked-by: Ani Sinha <None>
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Commit: [1/2] db0348f73893a7bb536e4a3562dc7ef33b2590ad
+
+The latest pytest release broke some tests in non-obvious ways. Pin
+the version for now so that CI passes.
+
+(cherry picked from commit 7c96c9cd9318e816ce4564b58a2c98271363c447)
+Signed-off-by: Cathy Avery <cavery@redhat.com>
+---
+ integration-requirements.txt | 2 +-
+ test-requirements.txt        | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/integration-requirements.txt b/integration-requirements.txt
+index 1f8b54a5..c0792d63 100644
+--- a/integration-requirements.txt
++++ b/integration-requirements.txt
+@@ -7,7 +7,7 @@ pycloudlib>=5.10.0,<1!6
+ # test/unittests/conftest.py to be loaded by our integration-tests tox env
+ # resulting in an unmet dependency issue:
+ # https://github.com/pytest-dev/pytest/issues/11104
+-pytest!=7.3.2
++pytest!=7.3.2,<8.0.0
+ 
+ packaging
+ passlib
+diff --git a/test-requirements.txt b/test-requirements.txt
+index 46a98b4c..3d2480fd 100644
+--- a/test-requirements.txt
++++ b/test-requirements.txt
+@@ -4,7 +4,7 @@
+ # test/unittests/conftest.py to be loaded by our integration-tests tox env
+ # resulting in an unmet dependency issue:
+ # https://github.com/pytest-dev/pytest/issues/11104
+-pytest!=7.3.2
++pytest!=7.3.2,<8.0.0
+ 
+ pytest-cov
+ pytest-mock
+-- 
+2.39.3
+

SOURCES/ci-feat-apply-global-DNS-to-interfaces-in-network-manag.patch

@@ -0,0 +1,207 @@
+From 1024e43b58ce84bb6c6d8bd89785704e04560b2a Mon Sep 17 00:00:00 2001
+From: Florian Apolloner <florian@apolloner.eu>
+Date: Fri, 5 Jan 2024 19:07:12 +0100
+Subject: [PATCH 2/3] feat: apply global DNS to interfaces in network-manager 
+ (#4723)
+
+RH-Author: Cathy Avery <cavery@redhat.com>
+RH-MergeRequest: 128: Fixes for cloud-init fails to configure DNS/search domains for network-config v1
+RH-Jira: RHEL-27134
+RH-Acked-by: Ani Sinha <anisinha@redhat.com>
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Commit: [2/2] 73d27116735e853fbaa38942390721dd78bc6241
+
+Sometimes DNS settings in cloud configs are specified globally and
+not per interface / subnet. This results in a configuration without
+proper nameservers. This was fixed for netplan in d29eeccd and is
+now also applied to the network-manager renderer.
+
+Co-authored-by: James Falcon <james.falcon@canonical.com>
+(cherry picked from commit 0d787d0a262f70ff848b315633742aa8fc45a1de)
+Signed-off-by: Cathy Avery <cavery@redhat.com>
+---
+ cloudinit/net/network_manager.py          | 52 ++++++++++++++---------
+ tests/unittests/net/test_net_rendering.py |  3 ++
+ tests/unittests/test_net.py               | 11 +++++
+ tools/.github-cla-signers                 |  1 +
+ 4 files changed, 47 insertions(+), 20 deletions(-)
+
+diff --git a/cloudinit/net/network_manager.py b/cloudinit/net/network_manager.py
+index bd6e6d75..0ba210b7 100644
+--- a/cloudinit/net/network_manager.py
++++ b/cloudinit/net/network_manager.py
+@@ -246,7 +246,7 @@ class NMConnection:
+         """
+         return addr.replace("-", ":").upper()
+ 
+-    def render_interface(self, iface, renderer):
++    def render_interface(self, iface, network_state, renderer):
+         """
+         Integrate information from network state interface information
+         into the connection. Most of the work is done here.
+@@ -311,7 +311,6 @@ class NMConnection:
+         found_dns_search = []
+ 
+         # Deal with Layer 3 configuration
+-        use_top_level_dns = "dns" in iface
+         for subnet in iface["subnets"]:
+             family = "ipv6" if subnet_is_ipv6(subnet) else "ipv4"
+ 
+@@ -322,26 +321,39 @@ class NMConnection:
+                 self.config[family]["gateway"] = subnet["gateway"]
+             for route in subnet["routes"]:
+                 self._add_route(route)
+-            if not use_top_level_dns and "dns_nameservers" in subnet:
+-                for nameserver in subnet["dns_nameservers"]:
+-                    found_nameservers.append(nameserver)
+-            if not use_top_level_dns and "dns_search" in subnet:
+-                found_dns_search.append(subnet["dns_search"])
++            # Add subnet-level DNS
++            if "dns_nameservers" in subnet:
++                found_nameservers.extend(subnet["dns_nameservers"])
++            if "dns_search" in subnet:
++                found_dns_search.extend(subnet["dns_search"])
+             if family == "ipv4" and "mtu" in subnet:
+                 ipv4_mtu = subnet["mtu"]
+ 
+-        # Now add our DNS search domains. We add them later because we
+-        # only want them if an IP family has already been defined
+-        if use_top_level_dns:
+-            for nameserver in iface["dns"]["nameservers"]:
+-                self._add_nameserver(nameserver)
+-            if iface["dns"]["search"]:
+-                self._add_dns_search(iface["dns"]["search"])
+-        else:
+-            for nameserver in found_nameservers:
+-                self._add_nameserver(nameserver)
+-            for dns_search in found_dns_search:
+-                self._add_dns_search(dns_search)
++        # Add interface-level DNS
++        if "dns" in iface:
++            found_nameservers += [
++                dns
++                for dns in iface["dns"]["nameservers"]
++                if dns not in found_nameservers
++            ]
++            found_dns_search += [
++                search
++                for search in iface["dns"]["search"]
++                if search not in found_dns_search
++            ]
++
++        # We prefer any interface-specific DNS entries, but if we do not
++        # have any, add the global DNS to the connection
++        if not found_nameservers and network_state.dns_nameservers:
++            found_nameservers = network_state.dns_nameservers
++        if not found_dns_search and network_state.dns_searchdomains:
++            found_dns_search = network_state.dns_searchdomains
++
++        # Write out all DNS entries to the connection
++        for nameserver in found_nameservers:
++            self._add_nameserver(nameserver)
++        if found_dns_search:
++            self._add_dns_search(found_dns_search)
+ 
+         # we do not want to set may-fail to false for both ipv4 and ipv6 dhcp
+         # at the at the same time. This will make the network configuration
+@@ -457,7 +469,7 @@ class Renderer(renderer.Renderer):
+         # Now render the actual interface configuration
+         for iface in network_state.iter_interfaces():
+             conn = self.connections[iface["name"]]
+-            conn.render_interface(iface, self)
++            conn.render_interface(iface, network_state, self)
+ 
+         # And finally write the files
+         for con_id, conn in self.connections.items():
+diff --git a/tests/unittests/net/test_net_rendering.py b/tests/unittests/net/test_net_rendering.py
+index 06feab89..f340ffc1 100644
+--- a/tests/unittests/net/test_net_rendering.py
++++ b/tests/unittests/net/test_net_rendering.py
+@@ -88,6 +88,9 @@ def _check_network_manager(network_state: NetworkState, tmp_path: Path):
+     "test_name, renderers",
+     [("no_matching_mac_v2", Renderer.Netplan | Renderer.NetworkManager)],
+ )
++@pytest.mark.xfail(
++    reason="v2 interface-specific DNS errantly gets applied globally"
++)
+ def test_convert(test_name, renderers, tmp_path):
+     network_config = safeyaml.load(
+         Path(ARTIFACT_DIR, f"{test_name}.yaml").read_text()
+diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
+index 678ec39b..e010eb6b 100644
+--- a/tests/unittests/test_net.py
++++ b/tests/unittests/test_net.py
+@@ -645,6 +645,7 @@ method=manual
+ may-fail=false
+ address1=172.19.1.34/22
+ route1=0.0.0.0/0,172.19.3.254
++dns=172.19.0.12;
+ 
+ """.lstrip(),
+             ),
+@@ -2769,6 +2770,8 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+                 [ipv4]
+                 method=auto
+                 may-fail=false
++                dns=8.8.8.8;4.4.4.4;8.8.4.4;
++                dns-search=barley.maas;wark.maas;foobar.maas;
+ 
+                 """
+             ),
+@@ -2794,6 +2797,8 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+                 method=manual
+                 may-fail=false
+                 address1=192.168.200.7/24
++                dns=8.8.8.8;4.4.4.4;8.8.4.4;
++                dns-search=barley.maas;wark.maas;foobar.maas;
+ 
+                 """
+             ),
+@@ -2818,6 +2823,8 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+                 [ipv4]
+                 method=auto
+                 may-fail=false
++                dns=8.8.8.8;4.4.4.4;8.8.4.4;
++                dns-search=barley.maas;wark.maas;foobar.maas;
+ 
+                 """
+             ),
+@@ -2902,12 +2909,15 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+                 method=manual
+                 may-fail=false
+                 address1=192.168.14.2/24
++                dns=8.8.8.8;4.4.4.4;8.8.4.4;
++                dns-search=barley.maas;wark.maas;foobar.maas;
+ 
+                 [ipv6]
+                 method=manual
+                 may-fail=false
+                 address1=2001:1::1/64
+                 route1=::/0,2001:4800:78ff:1b::1
++                dns-search=barley.maas;wark.maas;foobar.maas;
+ 
+                 """
+             ),
+@@ -2962,6 +2972,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+                 [ipv6]
+                 method=auto
+                 may-fail=false
++                dns-search=barley.maas;wark.maas;foobar.maas;
+ 
+                 """
+             ),
+diff --git a/tools/.github-cla-signers b/tools/.github-cla-signers
+index dbdb9cfa..f4da0989 100644
+--- a/tools/.github-cla-signers
++++ b/tools/.github-cla-signers
+@@ -13,6 +13,7 @@ andrewbogott
+ andrewlukoshko
+ ani-sinha
+ antonyc
++apollo13
+ aswinrajamannar
+ bdrung
+ beantaxi
+-- 
+2.41.0
+

SOURCES/ci-feat-sysconfig-Add-DNS-from-interface-config-to-reso.patch

@@ -0,0 +1,350 @@
+From 773501c6d2b52a5623b5fed3c5534d41aa6488fa Mon Sep 17 00:00:00 2001
+From: Ani Sinha <anisinha@redhat.com>
+Date: Thu, 20 Jun 2024 22:27:03 +0530
+Subject: [PATCH] feat(sysconfig): Add DNS from interface config to resolv.conf
+ (#5401)
+
+RH-Author: xiachen <xiachen@redhat.com>
+RH-MergeRequest: 140: feat(sysconfig): Add DNS from interface config to resolv.conf (#5401)
+RH-Jira: RHEL-46013
+RH-Acked-by: Ani Sinha <anisinha@redhat.com>
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Commit: [1/1] b9f492627cdae3bf356f388eb0870241793a7f99
+
+sysconfig renderer currently only uses global dns and search domain
+configuration in order to populate /etc/resolv.conf. This means it ignores
+interface specific dns configuration completely. This means, when global dns
+information is absent and only interface specific dns configuration is present,
+/etc/resolv.conf will not have complete dns information. Fix this so that
+per interface dns information is also taken into account along with global dns
+configuration in order to populate /etc/resolv.conf.
+
+Fixes: GH-5400
+
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+(cherry picked from commit 1b8030e0c7fd6fbff7e38ad1e3e6266ae50c83a5)
+---
+ cloudinit/net/sysconfig.py  |  52 +++++++++-
+ tests/unittests/test_net.py | 183 +++++++++++++++++++++++++++++++++++-
+ 2 files changed, 229 insertions(+), 6 deletions(-)
+
+diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
+index f01c4236..42eb2be3 100644
+--- a/cloudinit/net/sysconfig.py
++++ b/cloudinit/net/sysconfig.py
+@@ -824,20 +824,62 @@ class Renderer(renderer.Renderer):
+ 
+     @staticmethod
+     def _render_dns(network_state, existing_dns_path=None):
+-        # skip writing resolv.conf if network_state doesn't include any input.
++
++        found_nameservers = []
++        found_dns_search = []
++
++        for iface in network_state.iter_interfaces():
++            for subnet in iface["subnets"]:
++                # Add subnet-level DNS
++                if "dns_nameservers" in subnet:
++                    found_nameservers.extend(subnet["dns_nameservers"])
++                if "dns_search" in subnet:
++                    found_dns_search.extend(subnet["dns_search"])
++
++            # Add interface-level DNS
++            if "dns" in iface:
++                found_nameservers += [
++                    dns
++                    for dns in iface["dns"]["nameservers"]
++                    if dns not in found_nameservers
++                ]
++                found_dns_search += [
++                    search
++                    for search in iface["dns"]["search"]
++                    if search not in found_dns_search
++                ]
++
++        # When both global and interface specific entries are present,
++        # use them both to generate /etc/resolv.conf eliminating duplicate
++        # entries. Otherwise use global or interface specific entries whichever
++        # is provided.
++        if network_state.dns_nameservers:
++            found_nameservers += [
++                nameserver
++                for nameserver in network_state.dns_nameservers
++                if nameserver not in found_nameservers
++            ]
++        if network_state.dns_searchdomains:
++            found_dns_search += [
++                search
++                for search in network_state.dns_searchdomains
++                if search not in found_dns_search
++            ]
++
++        # skip writing resolv.conf if no dns information is provided in conf.
+         if not any(
+             [
+-                len(network_state.dns_nameservers),
+-                len(network_state.dns_searchdomains),
++                len(found_nameservers),
++                len(found_dns_search),
+             ]
+         ):
+             return None
+         content = resolv_conf.ResolvConf("")
+         if existing_dns_path and os.path.isfile(existing_dns_path):
+             content = resolv_conf.ResolvConf(util.load_file(existing_dns_path))
+-        for nameserver in network_state.dns_nameservers:
++        for nameserver in found_nameservers:
+             content.add_nameserver(nameserver)
+-        for searchdomain in network_state.dns_searchdomains:
++        for searchdomain in found_dns_search:
+             content.add_search_domain(searchdomain)
+         header = _make_header(";")
+         content_str = str(content)
+diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
+index e010eb6b..86ba398d 100644
+--- a/tests/unittests/test_net.py
++++ b/tests/unittests/test_net.py
+@@ -516,6 +516,8 @@ OS_SAMPLES = [
+                         }
+                     ],
+                     "ip_address": "172.19.1.34",
++                    "dns_search": ["testweb.com"],
++                    "dns_nameservers": ["172.19.0.13"],
+                     "id": "network0",
+                 }
+             ],
+@@ -550,7 +552,9 @@ STARTMODE=auto
+                 """
+ ; Created by cloud-init automatically, do not edit.
+ ;
++nameserver 172.19.0.13
+ nameserver 172.19.0.12
++search testweb.com
+ """.lstrip(),
+             ),
+             (
+@@ -581,6 +585,8 @@ dns = none
+ BOOTPROTO=none
+ DEFROUTE=yes
+ DEVICE=eth0
++DNS1=172.19.0.13
++DOMAIN=testweb.com
+ GATEWAY=172.19.3.254
+ HWADDR=fa:16:3e:ed:9a:59
+ IPADDR=172.19.1.34
+@@ -595,7 +601,173 @@ USERCTL=no
+                 """
+ ; Created by cloud-init automatically, do not edit.
+ ;
++nameserver 172.19.0.13
+ nameserver 172.19.0.12
++search testweb.com
++""".lstrip(),
++            ),
++            (
++                "etc/NetworkManager/conf.d/99-cloud-init.conf",
++                """
++# Created by cloud-init automatically, do not edit.
++#
++[main]
++dns = none
++""".lstrip(),
++            ),
++            (
++                "etc/udev/rules.d/70-persistent-net.rules",
++                "".join(
++                    [
++                        'SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ',
++                        'ATTR{address}=="fa:16:3e:ed:9a:59", NAME="eth0"\n',
++                    ]
++                ),
++            ),
++        ],
++        "expected_network_manager": [
++            (
++                "".join(
++                    [
++                        "etc/NetworkManager/system-connections",
++                        "/cloud-init-eth0.nmconnection",
++                    ]
++                ),
++                """
++# Generated by cloud-init. Changes will be lost.
++
++[connection]
++id=cloud-init eth0
++uuid=1dd9a779-d327-56e1-8454-c65e2556c12c
++autoconnect-priority=120
++type=ethernet
++
++[user]
++org.freedesktop.NetworkManager.origin=cloud-init
++
++[ethernet]
++mac-address=FA:16:3E:ED:9A:59
++
++[ipv4]
++method=manual
++may-fail=false
++address1=172.19.1.34/22
++route1=0.0.0.0/0,172.19.3.254
++dns=172.19.0.13;
++dns-search=testweb.com;
++
++""".lstrip(),
++            ),
++        ],
++    },
++    {
++        "in_data": {
++            "services": [
++                {
++                    "type": "dns",
++                    "address": "172.19.0.12",
++                    "search": ["example1.com", "example2.com"],
++                }
++            ],
++            "networks": [
++                {
++                    "network_id": "dacd568d-5be6-4786-91fe-750c374b78b4",
++                    "type": "ipv4",
++                    "netmask": "255.255.252.0",
++                    "link": "eth0",
++                    "routes": [
++                        {
++                            "netmask": "0.0.0.0",
++                            "network": "0.0.0.0",
++                            "gateway": "172.19.3.254",
++                        }
++                    ],
++                    "ip_address": "172.19.1.34",
++                    "dns_search": ["example3.com"],
++                    "dns_nameservers": ["172.19.0.12"],
++                    "id": "network0",
++                }
++            ],
++            "links": [
++                {
++                    "ethernet_mac_address": "fa:16:3e:ed:9a:59",
++                    "mtu": None,
++                    "type": "physical",
++                    "id": "eth0",
++                },
++            ],
++        },
++        "in_macs": {
++            "fa:16:3e:ed:9a:59": "eth0",
++        },
++        "out_sysconfig_opensuse": [
++            (
++                "etc/sysconfig/network/ifcfg-eth0",
++                """
++# Created by cloud-init automatically, do not edit.
++#
++BOOTPROTO=static
++IPADDR=172.19.1.34
++LLADDR=fa:16:3e:ed:9a:59
++NETMASK=255.255.252.0
++STARTMODE=auto
++""".lstrip(),
++            ),
++            (
++                "etc/resolv.conf",
++                """
++; Created by cloud-init automatically, do not edit.
++;
++nameserver 172.19.0.12
++search example3.com example1.com example2.com
++""".lstrip(),
++            ),
++            (
++                "etc/NetworkManager/conf.d/99-cloud-init.conf",
++                """
++# Created by cloud-init automatically, do not edit.
++#
++[main]
++dns = none
++""".lstrip(),
++            ),
++            (
++                "etc/udev/rules.d/85-persistent-net-cloud-init.rules",
++                "".join(
++                    [
++                        'SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ',
++                        'ATTR{address}=="fa:16:3e:ed:9a:59", NAME="eth0"\n',
++                    ]
++                ),
++            ),
++        ],
++        "out_sysconfig_rhel": [
++            (
++                "etc/sysconfig/network-scripts/ifcfg-eth0",
++                """
++# Created by cloud-init automatically, do not edit.
++#
++BOOTPROTO=none
++DEFROUTE=yes
++DEVICE=eth0
++DNS1=172.19.0.12
++DOMAIN=example3.com
++GATEWAY=172.19.3.254
++HWADDR=fa:16:3e:ed:9a:59
++IPADDR=172.19.1.34
++NETMASK=255.255.252.0
++ONBOOT=yes
++TYPE=Ethernet
++USERCTL=no
++""".lstrip(),
++            ),
++            (
++                "etc/resolv.conf",
++                """
++; Created by cloud-init automatically, do not edit.
++;
++nameserver 172.19.0.12
++search example3.com example1.com example2.com
+ """.lstrip(),
+             ),
+             (
+@@ -646,6 +818,7 @@ may-fail=false
+ address1=172.19.1.34/22
+ route1=0.0.0.0/0,172.19.3.254
+ dns=172.19.0.12;
++dns-search=example3.com;
+ 
+ """.lstrip(),
+             ),
+@@ -653,7 +826,13 @@ dns=172.19.0.12;
+     },
+     {
+         "in_data": {
+-            "services": [{"type": "dns", "address": "172.19.0.12"}],
++            "services": [
++                {
++                    "type": "dns",
++                    "address": "172.19.0.12",
++                    "search": "example.com",
++                }
++            ],
+             "networks": [
+                 {
+                     "network_id": "public-ipv4",
+@@ -714,6 +893,7 @@ STARTMODE=auto
+ ; Created by cloud-init automatically, do not edit.
+ ;
+ nameserver 172.19.0.12
++search example.com
+ """.lstrip(),
+             ),
+             (
+@@ -761,6 +941,7 @@ USERCTL=no
+ ; Created by cloud-init automatically, do not edit.
+ ;
+ nameserver 172.19.0.12
++search example.com
+ """.lstrip(),
+             ),
+             (
+-- 
+2.45.1
+

SOURCES/ci-fix-Add-subnet-ipv4-ipv6-to-network-schema-5191.patch

@@ -0,0 +1,45 @@
+From b424877c0e7673466e7bd354c1eed4db908ebab3 Mon Sep 17 00:00:00 2001
+From: James Falcon <james.falcon@canonical.com>
+Date: Thu, 18 Apr 2024 20:27:27 -0500
+Subject: [PATCH] fix: Add subnet ipv4/ipv6  to network schema (#5191)
+
+RH-Author: Ani Sinha <anisinha@redhat.com>
+RH-MergeRequest: 143: fix: Add subnet ipv4/ipv6  to network schema (#5191)
+RH-Jira: RHEL-54155
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Acked-by: Cathy Avery <cavery@redhat.com>
+RH-Commit: [1/1] d4c7beb80b8c67df6b6fc04db8d3b93ed82dd067
+
+These are used by our openstack network_data.json parsing code and
+get used by the sysconfig renderer.
+
+Fixes GH-4911
+
+(cherry picked from commit 0b1ca174095e3ad685e6d6649bb08aafb19a95b9)
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+---
+ cloudinit/config/schemas/schema-network-config-v1.json | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/cloudinit/config/schemas/schema-network-config-v1.json b/cloudinit/config/schemas/schema-network-config-v1.json
+index 64c492a4..f485c784 100644
+--- a/cloudinit/config/schemas/schema-network-config-v1.json
++++ b/cloudinit/config/schemas/schema-network-config-v1.json
+@@ -523,6 +523,14 @@
+           "items": {
+             "$ref": "#/$defs/anyOf_type_route"
+           }
++        },
++        "ipv4": {
++          "type": "boolean",
++          "description": "Indicate if the subnet is IPv4. If not specified, it will be inferred from the subnet type or address. This exists for compatibility with OpenStack's ``network_data.json`` when rendered through sysconfig."
++        },
++        "ipv6": {
++          "type": "boolean",
++          "description": "Indicate if the subnet is IPv6. If not specified, it will be inferred from the subnet type or address. This is exists for compatibility with OpenStack's ``network_data.json`` when rendered through sysconfig."
+         }
+       }
+     },
+-- 
+2.45.1
+

SOURCES/ci-fix-Add-types-to-network-v1-schema-4841.patch

@@ -0,0 +1,110 @@
+From 720faf533832ba758dcc8436f144168996508c2a Mon Sep 17 00:00:00 2001
+From: James Falcon <james.falcon@canonical.com>
+Date: Tue, 6 Feb 2024 09:24:37 -0600
+Subject: [PATCH 2/2] fix: Add types to network v1 schema (#4841)
+
+RH-Author: Cathy Avery <cavery@redhat.com>
+RH-MergeRequest: 123: fix: Add types to network v1 schema (#4841)
+RH-Jira: RHEL-21323
+RH-Acked-by: Ani Sinha <None>
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Commit: [2/2] a73a68dff5a6ef54dc4e3b3527fc778400a461cc
+
+Conflicts:
+For RHEL no log argument as we are not including commit e168b4a1383b6eae9c1dc81411d7684fcbbf7df9
+
+Even though it has conflicted with our documentation, we have allowed
+nameserver address to a be a string, mtu to be empty, and nameserver
+search to be missing. Since we have allowed these, expand our schema
+and documentation accordingly.
+
+Fixes GH-4710
+
+(cherry picked from commit b08193b376552ede5d162d8283310adc783d81bf)
+Signed-off-by: Cathy Avery <cavery@redhat.com>
+---
+ .../config/schemas/schema-network-config-v1.json    | 13 +++++++++----
+ doc/rtd/reference/network-config-format-v1.rst      |  4 ++--
+ tests/unittests/config/test_schema.py               | 13 +++++++++++++
+ 3 files changed, 24 insertions(+), 6 deletions(-)
+
+diff --git a/cloudinit/config/schemas/schema-network-config-v1.json b/cloudinit/config/schemas/schema-network-config-v1.json
+index c77885ec..56dc27c9 100644
+--- a/cloudinit/config/schemas/schema-network-config-v1.json
++++ b/cloudinit/config/schemas/schema-network-config-v1.json
+@@ -24,7 +24,10 @@
+           "description": "The lowercase MAC address of the physical device."
+         },
+         "mtu": {
+-          "type": "integer",
++          "type": [
++            "integer",
++            "null"
++          ],
+           "description": "The MTU size in bytes. The ``mtu`` key represents a device's Maximum Transmission Unit, which is the largest size packet or frame, specified in octets (eight-bit bytes), that can be sent in a packet- or frame-based network. Specifying ``mtu`` is optional. Values too small or too large for a device may be ignored by that device."
+         },
+         "subnets": {
+@@ -384,8 +387,7 @@
+       "additionalProperties": false,
+       "required": [
+         "type",
+-        "address",
+-        "search"
++        "address"
+       ],
+       "properties": {
+         "type": {
+@@ -396,7 +398,10 @@
+         },
+         "address": {
+           "description": "List of IPv4 or IPv6 address of nameservers.",
+-          "type": "array",
++          "type": [
++            "array",
++            "string"
++          ],
+           "items": {
+             "type": "string"
+           }
+diff --git a/doc/rtd/reference/network-config-format-v1.rst b/doc/rtd/reference/network-config-format-v1.rst
+index d267eb94..42f2dc22 100644
+--- a/doc/rtd/reference/network-config-format-v1.rst
++++ b/doc/rtd/reference/network-config-format-v1.rst
+@@ -252,8 +252,8 @@ Users can specify a ``nameserver`` type. Nameserver dictionaries include
+ the following keys:
+ 
+ - ``address``: List of IPv4 or IPv6 address of nameservers.
+-- ``search``: List of hostnames to include in the :file:`resolv.conf` search
+-  path.
++- ``search``: Optional. List of hostnames to include in the :file:`resolv.conf`
++  search path.
+ - ``interface``: Optional. Ties the nameserver definition to the specified
+   interface. The value specified here must match the ``name`` of an interface
+   defined in this config. If unspecified, this nameserver will be considered
+diff --git a/tests/unittests/config/test_schema.py b/tests/unittests/config/test_schema.py
+index 28f0b39d..52667332 100644
+--- a/tests/unittests/config/test_schema.py
++++ b/tests/unittests/config/test_schema.py
+@@ -2048,6 +2048,19 @@ class TestNetworkSchema:
+                 does_not_raise(),
+                 id="bond_with_all_known_properties",
+             ),
++            pytest.param(
++                {
++                    "network": {
++                        "version": 1,
++                        "config": [
++                            {"type": "physical", "name": "eth0", "mtu": None},
++                            {"type": "nameserver", "address": "8.8.8.8"},
++                        ],
++                    }
++                },
++                does_not_raise(),
++                id="GH-4710_mtu_none_and_str_address",
++            ),
+         ),
+     )
+     def test_network_schema(self, src_config, expectation):
+-- 
+2.39.3
+

SOURCES/ci-fix-Always-use-single-datasource-if-specified-5098.patch

@@ -0,0 +1,66 @@
+From 4e5b1ed68014b81ca2ef2f07675f2a43cf03c5c3 Mon Sep 17 00:00:00 2001
+From: James Falcon <james.falcon@canonical.com>
+Date: Tue, 26 Mar 2024 15:55:50 -0500
+Subject: [PATCH] fix: Always use single datasource if specified (#5098)
+
+RH-Author: Ani Sinha <anisinha@redhat.com>
+RH-MergeRequest: 135: fix: Always use single datasource if specified (#5098)
+RH-Jira: RHEL-36701
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Acked-by: Cathy Avery <cavery@redhat.com>
+RH-Commit: [1/1] 491f053f7d758f1a0ca8918d1449cc2f7838291f
+
+This change may require a user to add `None` to the `datasource_list`
+defined in `/etc/cloud/cloud.cfg[.d]` if they have a customized
+datasource_list and want the DataSourceNone fallback behavior.
+
+ds-identify would automatically append "None" to the datasource_list
+if a single entry was provided in /etc/cloud/cloud.cfg[.d].
+This wasn't a problem in the past as the python code would detect
+a single datasource along with None as an indication to automatically
+use that datasource. Since the python code no longer does that,
+we should ensure that one specified datasource results in one specified
+datasource after ds-identify has run.
+
+Fixes GH-5091
+
+(cherry picked from commit cdbbd17ae400e432d13f674c18a6f5c873fa328b)
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+---
+ tests/unittests/test_ds_identify.py | 2 +-
+ tools/ds-identify                   | 6 +++++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/tests/unittests/test_ds_identify.py b/tests/unittests/test_ds_identify.py
+index ba0bf779..acbf3f03 100644
+--- a/tests/unittests/test_ds_identify.py
++++ b/tests/unittests/test_ds_identify.py
+@@ -522,7 +522,7 @@ class TestDsIdentify(DsIdentifyBase):
+         mydata = copy.deepcopy(VALID_CFG["Ec2-hvm"])
+         cfgpath = "etc/cloud/cloud.cfg.d/myds.cfg"
+         mydata["files"][cfgpath] = 'datasource_list: ["NoCloud"]\n'
+-        self._check_via_dict(mydata, rc=RC_FOUND, dslist=["NoCloud", DS_NONE])
++        self._check_via_dict(mydata, rc=RC_FOUND, dslist=["NoCloud"])
+ 
+     def test_configured_list_with_none(self):
+         """When datasource_list already contains None, None is not added.
+diff --git a/tools/ds-identify b/tools/ds-identify
+index ec2cc18a..6e49ded3 100755
+--- a/tools/ds-identify
++++ b/tools/ds-identify
+@@ -1865,7 +1865,11 @@ _main() {
+     # if there is only a single entry in $DI_DSLIST
+     if [ $# -eq 1 ] || [ $# -eq 2 -a "$2" = "None" ] ; then
+         debug 1 "single entry in datasource_list ($DI_DSLIST) use that."
+-        found "$@"
++        if [ $# -eq 1 ]; then
++            write_result "datasource_list: [ $1 ]"
++        else
++            found "$@"
++        fi
+         return
+     fi
+ 
+-- 
+2.45.1
+

SOURCES/ci-fix-Clean-cache-if-no-datasource-fallback-5499.patch

@@ -0,0 +1,247 @@
+From cfbe83d4a869ab20d385b5058031df0364483bda Mon Sep 17 00:00:00 2001
+From: James Falcon <james.falcon@canonical.com>
+Date: Thu, 18 Jul 2024 09:04:54 -0400
+Subject: [PATCH] fix: Clean cache if no datasource fallback (#5499)
+
+RH-Author: Ani Sinha <anisinha@redhat.com>
+RH-MergeRequest: 141: fix: Clean cache if no datasource fallback (#5499)
+RH-Jira: RHEL-49742
+RH-Acked-by: xiachen <xiachen@redhat.com>
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Commit: [1/1] 64a79c1a6bd06c280aed85032bb55cc60ec1fc2e
+
+9929a00 added the ability to used a cached datasource when none is
+found. This was supposed to be per-datasource, but the lack of cache
+cleaning got applied universally. This commit makes it so cache will be
+cleaned as it was before if fallback isn't implemented in datasource.
+
+Fixes GH-5486
+
+(cherry picked from commit 550c685c98551f65c30832b186fe091721b48477)
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+---
+ cloudinit/stages.py                           |   1 +
+ .../assets/DataSourceNoCacheNetworkOnly.py    |  23 ++++
+ .../assets/DataSourceNoCacheWithFallback.py   |  29 +++++
+ .../datasources/test_caching.py               | 115 ++++++++++++++++++
+ tests/integration_tests/instances.py          |   4 +-
+ 5 files changed, 171 insertions(+), 1 deletion(-)
+ create mode 100644 tests/integration_tests/assets/DataSourceNoCacheNetworkOnly.py
+ create mode 100644 tests/integration_tests/assets/DataSourceNoCacheWithFallback.py
+ create mode 100644 tests/integration_tests/datasources/test_caching.py
+
+diff --git a/cloudinit/stages.py b/cloudinit/stages.py
+index 0b795624..ace94c9a 100644
+--- a/cloudinit/stages.py
++++ b/cloudinit/stages.py
+@@ -378,6 +378,7 @@ class Init:
+                         ds,
+                     )
+                 else:
++                    util.del_file(self.paths.instance_link)
+                     raise e
+         self.datasource = ds
+         # Ensure we adjust our path members datasource
+diff --git a/tests/integration_tests/assets/DataSourceNoCacheNetworkOnly.py b/tests/integration_tests/assets/DataSourceNoCacheNetworkOnly.py
+new file mode 100644
+index 00000000..54a7bab3
+--- /dev/null
++++ b/tests/integration_tests/assets/DataSourceNoCacheNetworkOnly.py
+@@ -0,0 +1,23 @@
++import logging
++
++from cloudinit import sources
++
++LOG = logging.getLogger(__name__)
++
++
++class DataSourceNoCacheNetworkOnly(sources.DataSource):
++    def _get_data(self):
++        LOG.debug("TEST _get_data called")
++        return True
++
++
++datasources = [
++    (
++        DataSourceNoCacheNetworkOnly,
++        (sources.DEP_FILESYSTEM, sources.DEP_NETWORK),
++    ),
++]
++
++
++def get_datasource_list(depends):
++    return sources.list_from_depends(depends, datasources)
+diff --git a/tests/integration_tests/assets/DataSourceNoCacheWithFallback.py b/tests/integration_tests/assets/DataSourceNoCacheWithFallback.py
+new file mode 100644
+index 00000000..fdfc473f
+--- /dev/null
++++ b/tests/integration_tests/assets/DataSourceNoCacheWithFallback.py
+@@ -0,0 +1,29 @@
++import logging
++import os
++
++from cloudinit import sources
++
++LOG = logging.getLogger(__name__)
++
++
++class DataSourceNoCacheWithFallback(sources.DataSource):
++    def _get_data(self):
++        if os.path.exists("/ci-test-firstboot"):
++            LOG.debug("TEST _get_data called")
++            return True
++        return False
++
++    def check_if_fallback_is_allowed(self):
++        return True
++
++
++datasources = [
++    (
++        DataSourceNoCacheWithFallback,
++        (sources.DEP_FILESYSTEM,),
++    ),
++]
++
++
++def get_datasource_list(depends):
++    return sources.list_from_depends(depends, datasources)
+diff --git a/tests/integration_tests/datasources/test_caching.py b/tests/integration_tests/datasources/test_caching.py
+new file mode 100644
+index 00000000..33e4b671
+--- /dev/null
++++ b/tests/integration_tests/datasources/test_caching.py
+@@ -0,0 +1,115 @@
++import pytest
++
++from tests.integration_tests import releases, util
++from tests.integration_tests.instances import IntegrationInstance
++
++
++def setup_custom_datasource(client: IntegrationInstance, datasource_name: str):
++    client.write_to_file(
++        "/etc/cloud/cloud.cfg.d/99-imds.cfg",
++        f"datasource_list: [ {datasource_name}, None ]\n"
++        "datasource_pkg_list: [ cisources ]",
++    )
++    assert client.execute(
++        "mkdir -p /usr/lib/python3/dist-packages/cisources"
++    )
++    client.push_file(
++        util.ASSETS_DIR / f"DataSource{datasource_name}.py",
++        "/usr/lib/python3/dist-packages/cisources/"
++        f"DataSource{datasource_name}.py",
++    )
++
++
++def verify_no_cache_boot(client: IntegrationInstance):
++    log = client.read_from_file("/var/log/cloud-init.log")
++    util.verify_ordered_items_in_text(
++        [
++            "No local datasource found",
++            "running 'init'",
++            "no cache found",
++            "Detected platform",
++            "TEST _get_data called",
++        ],
++        text=log,
++    )
++    util.verify_clean_boot(client)
++
++
++@pytest.mark.skipif(
++    not releases.IS_UBUNTU,
++    reason="hardcoded dist-packages directory",
++)
++def test_no_cache_network_only(client: IntegrationInstance):
++    """Test cache removal per boot. GH-5486
++
++    This tests the CloudStack password reset use case. The expectation is:
++    - Metadata is fetched in network timeframe only
++    - Because `check_instance_id` is not defined, no cached datasource
++      is found in the init-local phase, but the cache is used in the
++      remaining phases due to existance of /run/cloud-init/.instance-id
++    - Because `check_if_fallback_is_allowed` is not defined, cloud-init
++      does NOT fall back to the pickled datasource, and will
++      instead delete the cache during the init-local phase
++    - Metadata is therefore fetched every boot in the network phase
++    """
++    setup_custom_datasource(client, "NoCacheNetworkOnly")
++
++    # Run cloud-init as if first boot
++    assert client.execute("cloud-init clean --logs")
++    client.restart()
++
++    verify_no_cache_boot(client)
++
++    # Clear the log without clean and run cloud-init for subsequent boot
++    assert client.execute("echo '' > /var/log/cloud-init.log")
++    client.restart()
++
++    verify_no_cache_boot(client)
++
++
++@pytest.mark.skipif(
++    not releases.IS_UBUNTU,
++    reason="hardcoded dist-packages directory",
++)
++def test_no_cache_with_fallback(client: IntegrationInstance):
++    """Test we use fallback when defined and no cache available."""
++    setup_custom_datasource(client, "NoCacheWithFallback")
++
++    # Run cloud-init as if first boot
++    assert client.execute("cloud-init clean --logs")
++    # Used by custom datasource
++    client.execute("touch /ci-test-firstboot")
++    client.restart()
++
++    log = client.read_from_file("/var/log/cloud-init.log")
++    util.verify_ordered_items_in_text(
++        [
++            "no cache found",
++            "Detected platform",
++            "TEST _get_data called",
++            "running 'init'",
++            "restored from cache with run check",
++            "running 'modules:config'",
++        ],
++        text=log,
++    )
++    util.verify_clean_boot(client)
++
++    # Clear the log without clean and run cloud-init for subsequent boot
++    assert client.execute("echo '' > /var/log/cloud-init.log")
++    client.execute("rm /ci-test-firstboot")
++    client.restart()
++
++    log = client.read_from_file("/var/log/cloud-init.log")
++    util.verify_ordered_items_in_text(
++        [
++            "cache invalid in datasource",
++            "Detected platform",
++            "Restored fallback datasource from checked cache",
++            "running 'init'",
++            "restored from cache with run check",
++            "running 'modules:config'",
++        ],
++        text=log,
++    )
++    util.verify_clean_boot(client)
+diff --git a/tests/integration_tests/instances.py b/tests/integration_tests/instances.py
+index 3fc6558a..23c0dc98 100644
+--- a/tests/integration_tests/instances.py
++++ b/tests/integration_tests/instances.py
+@@ -88,7 +88,9 @@ class IntegrationInstance:
+         # First push to a temporary directory because of permissions issues
+         tmp_path = _get_tmp_path()
+         self.instance.push_file(str(local_path), tmp_path)
+-        assert self.execute("mv {} {}".format(tmp_path, str(remote_path))).ok
++        assert self.execute(
++            "mv {} {}".format(tmp_path, str(remote_path))
++        ), f"Failed to push {tmp_path} to {remote_path}"
+ 
+     def read_from_file(self, remote_path) -> str:
+         result = self.execute("cat {}".format(remote_path))
+-- 
+2.39.3
+

SOURCES/ci-fix-Correct-v2-NetworkManager-route-rendering-4637.patch

@@ -0,0 +1,391 @@
+From 65207b6778fa97ff450a9200c28e4770c9128854 Mon Sep 17 00:00:00 2001
+From: James Falcon <james.falcon@canonical.com>
+Date: Tue, 2 Jan 2024 11:29:17 -0600
+Subject: [PATCH 1/3] fix: Correct v2 NetworkManager route rendering (#4637)
+
+RH-Author: Cathy Avery <cavery@redhat.com>
+RH-MergeRequest: 128: Fixes for cloud-init fails to configure DNS/search domains for network-config v1
+RH-Jira: RHEL-27134
+RH-Acked-by: Ani Sinha <anisinha@redhat.com>
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Commit: [1/2] abfebdde6b8b914d5a7de8853beca1fe206a5b23
+
+fix: Correct v2 NetworkManager route rendering
+
+Because network v2 route defintions can have mixed v4 and v6 routes, we
+need to determine the IP family per route rather than per subnet.
+
+Similar, ensure dns-search is rendered correctly.
+
+Fixes GH-4518
+
+(cherry picked from commit c2c100e8c9fd8709539b3ab2b0ee34c66ba3f2f7)
+Signed-off-by: Cathy Avery <cavery@redhat.com>
+---
+ cloudinit/net/__init__.py        |   2 +
+ cloudinit/net/network_manager.py |  87 +++++++++-------
+ tests/unittests/test_net.py      | 165 ++++++++++++++++++++++++++++++-
+ 3 files changed, 219 insertions(+), 35 deletions(-)
+
+diff --git a/cloudinit/net/__init__.py b/cloudinit/net/__init__.py
+index c0888f52..65e7ff33 100644
+--- a/cloudinit/net/__init__.py
++++ b/cloudinit/net/__init__.py
+@@ -1287,6 +1287,8 @@ def subnet_is_ipv6(subnet) -> bool:
+     """Common helper for checking network_state subnets for ipv6."""
+     # 'static6', 'dhcp6', 'ipv6_dhcpv6-stateful', 'ipv6_dhcpv6-stateless' or
+     # 'ipv6_slaac'
++    # This function is inappropriate for v2-based routes as routes defined
++    # under v2 subnets can contain ipv4 and ipv6 simultaneously
+     if subnet["type"].endswith("6") or subnet["type"] in IPV6_DYNAMIC_TYPES:
+         # This is a request either static6 type or DHCPv6.
+         return True
+diff --git a/cloudinit/net/network_manager.py b/cloudinit/net/network_manager.py
+index 76a0ac15..bd6e6d75 100644
+--- a/cloudinit/net/network_manager.py
++++ b/cloudinit/net/network_manager.py
+@@ -12,10 +12,15 @@ import itertools
+ import logging
+ import os
+ import uuid
+-from typing import Optional
++from typing import List, Optional
+ 
+ from cloudinit import subp, util
+-from cloudinit.net import is_ipv6_address, renderer, subnet_is_ipv6
++from cloudinit.net import (
++    is_ipv6_address,
++    is_ipv6_network,
++    renderer,
++    subnet_is_ipv6,
++)
+ from cloudinit.net.network_state import NetworkState
+ from cloudinit.net.sysconfig import available_nm_ifcfg_rh
+ 
+@@ -158,11 +163,11 @@ class NMConnection:
+         if self.config[family]["method"] == "auto" and method == "manual":
+             return
+ 
+-        if (
+-            subnet_type == "ipv6_dhcpv6-stateful"
+-            or subnet_type == "ipv6_dhcpv6-stateless"
+-            or subnet_type == "ipv6_slaac"
+-        ):
++        if subnet_type in [
++            "ipv6_dhcpv6-stateful",
++            "ipv6_dhcpv6-stateless",
++            "ipv6_slaac",
++        ]:
+             # set ipv4 method to 'disabled' to align with sysconfig renderer.
+             self._set_default("ipv4", "method", "disabled")
+ 
+@@ -174,7 +179,8 @@ class NMConnection:
+         Adds a numbered property, such as address<n> or route<n>, ensuring
+         the appropriate value gets used for <n>.
+         """
+-
++        if not self.config.has_section(section):
++            self.config[section] = {}
+         for index in itertools.count(1):
+             key = f"{key_prefix}{index}"
+             if not self.config.has_option(section, key):
+@@ -189,40 +195,37 @@ class NMConnection:
+         value = subnet["address"] + "/" + str(subnet["prefix"])
+         self._add_numbered(family, "address", value)
+ 
+-    def _add_route(self, family, route):
+-        """
+-        Adds a ipv[46].route<n> property.
+-        """
+-
++    def _add_route(self, route):
++        """Adds a ipv[46].route<n> property."""
++        # Because network v2 route definitions can have mixed v4 and v6
++        # routes, determine the family per route based on the gateway
++        family = "ipv6" if is_ipv6_network(route["gateway"]) else "ipv4"
+         value = route["network"] + "/" + str(route["prefix"])
+         if "gateway" in route:
+             value = value + "," + route["gateway"]
+         self._add_numbered(family, "route", value)
+ 
+-    def _add_nameserver(self, dns):
++    def _add_nameserver(self, dns: str) -> None:
+         """
+         Extends the ipv[46].dns property with a name server.
+         """
+-
+-        # FIXME: the subnet contains IPv4 and IPv6 name server mixed
+-        # together. We might be getting an IPv6 name server while
+-        # we're dealing with an IPv4 subnet. Sort this out by figuring
+-        # out the correct family and making sure a valid section exist.
+         family = "ipv6" if is_ipv6_address(dns) else "ipv4"
+-        self._set_default(family, "method", "disabled")
+-
+-        self._set_default(family, "dns", "")
+-        self.config[family]["dns"] = self.config[family]["dns"] + dns + ";"
++        if self.config.has_section(family):
++            self._set_default(family, "dns", "")
++            self.config[family]["dns"] = self.config[family]["dns"] + dns + ";"
+ 
+-    def _add_dns_search(self, family, dns_search):
++    def _add_dns_search(self, dns_search: List[str]) -> None:
+         """
+         Extends the ipv[46].dns-search property with a name server.
+         """
+-
+-        self._set_default(family, "dns-search", "")
+-        self.config[family]["dns-search"] = (
+-            self.config[family]["dns-search"] + ";".join(dns_search) + ";"
+-        )
++        for family in ["ipv4", "ipv6"]:
++            if self.config.has_section(family):
++                self._set_default(family, "dns-search", "")
++                self.config[family]["dns-search"] = (
++                    self.config[family]["dns-search"]
++                    + ";".join(dns_search)
++                    + ";"
++                )
+ 
+     def con_uuid(self):
+         """
+@@ -304,8 +307,11 @@ class NMConnection:
+ 
+         device_mtu = iface["mtu"]
+         ipv4_mtu = None
++        found_nameservers = []
++        found_dns_search = []
+ 
+         # Deal with Layer 3 configuration
++        use_top_level_dns = "dns" in iface
+         for subnet in iface["subnets"]:
+             family = "ipv6" if subnet_is_ipv6(subnet) else "ipv4"
+ 
+@@ -315,15 +321,28 @@ class NMConnection:
+             if "gateway" in subnet:
+                 self.config[family]["gateway"] = subnet["gateway"]
+             for route in subnet["routes"]:
+-                self._add_route(family, route)
+-            if "dns_nameservers" in subnet:
++                self._add_route(route)
++            if not use_top_level_dns and "dns_nameservers" in subnet:
+                 for nameserver in subnet["dns_nameservers"]:
+-                    self._add_nameserver(nameserver)
+-            if "dns_search" in subnet:
+-                self._add_dns_search(family, subnet["dns_search"])
++                    found_nameservers.append(nameserver)
++            if not use_top_level_dns and "dns_search" in subnet:
++                found_dns_search.append(subnet["dns_search"])
+             if family == "ipv4" and "mtu" in subnet:
+                 ipv4_mtu = subnet["mtu"]
+ 
++        # Now add our DNS search domains. We add them later because we
++        # only want them if an IP family has already been defined
++        if use_top_level_dns:
++            for nameserver in iface["dns"]["nameservers"]:
++                self._add_nameserver(nameserver)
++            if iface["dns"]["search"]:
++                self._add_dns_search(iface["dns"]["search"])
++        else:
++            for nameserver in found_nameservers:
++                self._add_nameserver(nameserver)
++            for dns_search in found_dns_search:
++                self._add_dns_search(dns_search)
++
+         # we do not want to set may-fail to false for both ipv4 and ipv6 dhcp
+         # at the at the same time. This will make the network configuration
+         # work only when both ipv4 and ipv6 dhcp succeeds. This may not be
+diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
+index e52c2497..678ec39b 100644
+--- a/tests/unittests/test_net.py
++++ b/tests/unittests/test_net.py
+@@ -2934,9 +2934,9 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+                 may-fail=false
+                 address1=192.168.0.2/24
+                 gateway=192.168.0.1
++                address2=192.168.2.10/24
+                 dns=192.168.0.10;10.23.23.134;
+                 dns-search=barley.maas;sacchromyces.maas;brettanomyces.maas;
+-                address2=192.168.2.10/24
+ 
+                 """
+             ),
+@@ -4114,6 +4114,148 @@ iface bond0 inet6 static
+             """
+         ),
+     },
++    "v2-mixed-routes": {
++        "expected_network_manager": {
++            "cloud-init-eth0.nmconnection": textwrap.dedent(
++                """\
++                # Generated by cloud-init. Changes will be lost.
++
++                [connection]
++                id=cloud-init eth0
++                uuid=1dd9a779-d327-56e1-8454-c65e2556c12c
++                autoconnect-priority=120
++                type=ethernet
++                interface-name=eth0
++
++                [user]
++                org.freedesktop.NetworkManager.origin=cloud-init
++
++                [ethernet]
++
++                [ipv4]
++                method=auto
++                may-fail=true
++                route1=169.254.42.42/32,62.210.0.1
++                route2=169.254.42.43/32,62.210.0.2
++                address1=192.168.1.20/16
++                dns=8.8.8.8;
++                dns-search=lab;home;
++
++                [ipv6]
++                route1=::/0,fe80::dc00:ff:fe20:186
++                route2=fe80::dc00:ff:fe20:188/64,fe80::dc00:ff:fe20:187
++                method=auto
++                may-fail=true
++                address1=2001:bc8:1210:232:dc00:ff:fe20:185/64
++                dns=FEDC::1;
++                dns-search=lab;home;
++
++            """
++            )
++        },
++        "yaml": textwrap.dedent(
++            """\
++            version: 2
++            ethernets:
++              eth0:
++                dhcp4: true
++                dhcp6: true
++                nameservers:
++                  search: [lab, home]
++                  addresses: [8.8.8.8, "FEDC::1"]
++                routes:
++                  - to: 169.254.42.42/32
++                    via: 62.210.0.1
++                  - via: fe80::dc00:ff:fe20:186
++                    to: ::/0
++                  - to: 169.254.42.43/32
++                    via: 62.210.0.2
++                  - via: fe80::dc00:ff:fe20:187
++                    to: fe80::dc00:ff:fe20:188
++                addresses:
++                  - 192.168.1.20/16
++                  - 2001:bc8:1210:232:dc00:ff:fe20:185/64
++        """
++        ),
++    },
++    "v2-dns-no-if-ips": {
++        "expected_network_manager": {
++            "cloud-init-eth0.nmconnection": textwrap.dedent(
++                """\
++                # Generated by cloud-init. Changes will be lost.
++
++                [connection]
++                id=cloud-init eth0
++                uuid=1dd9a779-d327-56e1-8454-c65e2556c12c
++                autoconnect-priority=120
++                type=ethernet
++                interface-name=eth0
++
++                [user]
++                org.freedesktop.NetworkManager.origin=cloud-init
++
++                [ethernet]
++
++                [ipv4]
++                method=auto
++                may-fail=true
++                dns=8.8.8.8;
++                dns-search=lab;home;
++
++                [ipv6]
++                method=auto
++                may-fail=true
++                dns=FEDC::1;
++                dns-search=lab;home;
++
++            """
++            )
++        },
++        "yaml": textwrap.dedent(
++            """\
++            version: 2
++            ethernets:
++              eth0:
++                dhcp4: true
++                dhcp6: true
++                nameservers:
++                  search: [lab, home]
++                  addresses: [8.8.8.8, "FEDC::1"]
++        """
++        ),
++    },
++    "v2-dns-no-dhcp": {
++        "expected_network_manager": {
++            "cloud-init-eth0.nmconnection": textwrap.dedent(
++                """\
++                # Generated by cloud-init. Changes will be lost.
++
++                [connection]
++                id=cloud-init eth0
++                uuid=1dd9a779-d327-56e1-8454-c65e2556c12c
++                autoconnect-priority=120
++                type=ethernet
++                interface-name=eth0
++
++                [user]
++                org.freedesktop.NetworkManager.origin=cloud-init
++
++                [ethernet]
++
++            """
++            )
++        },
++        "yaml": textwrap.dedent(
++            """\
++            version: 2
++            ethernets:
++              eth0:
++                nameservers:
++                  search: [lab, home]
++                  addresses: [8.8.8.8, "FEDC::1"]
++        """
++        ),
++    },
+ }
+ 
+ 
+@@ -6214,6 +6356,27 @@ class TestNetworkManagerRendering(CiTestCase):
+             entry[self.expected_name], self.expected_conf_d, found
+         )
+ 
++    def test_v2_mixed_routes(self):
++        entry = NETWORK_CONFIGS["v2-mixed-routes"]
++        found = self._render_and_read(network_config=yaml.load(entry["yaml"]))
++        self._compare_files_to_expected(
++            entry[self.expected_name], self.expected_conf_d, found
++        )
++
++    def test_v2_dns_no_ips(self):
++        entry = NETWORK_CONFIGS["v2-dns-no-if-ips"]
++        found = self._render_and_read(network_config=yaml.load(entry["yaml"]))
++        self._compare_files_to_expected(
++            entry[self.expected_name], self.expected_conf_d, found
++        )
++
++    def test_v2_dns_no_dhcp(self):
++        entry = NETWORK_CONFIGS["v2-dns-no-dhcp"]
++        found = self._render_and_read(network_config=yaml.load(entry["yaml"]))
++        self._compare_files_to_expected(
++            entry[self.expected_name], self.expected_conf_d, found
++        )
++
+ 
+ @mock.patch(
+     "cloudinit.net.is_openvswitch_internal_interface",
+-- 
+2.41.0
+

SOURCES/ci-fix-Fall-back-to-cached-local-ds-if-no-valid-ds-foun.patch

@@ -0,0 +1,156 @@
+From d17e05b1709e3b7148e889512282603f7399c857 Mon Sep 17 00:00:00 2001
+From: PengpengSun <40026211+PengpengSun@users.noreply.github.com>
+Date: Fri, 29 Mar 2024 22:39:13 +0800
+Subject: [PATCH] fix: Fall back to cached local ds if no valid ds found
+ (#4997)
+
+RH-Author: Ani Sinha <anisinha@redhat.com>
+RH-MergeRequest: 133: fix: Fall back to cached local ds if no valid ds found (#4997)
+RH-Jira: RHEL-32841
+RH-Acked-by: Cathy Avery <cavery@redhat.com>
+RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
+RH-Commit: [1/1] df9c6fda66dee9622725ff2d52e64999796324b8
+
+Rebooting an instance which has finished VMware guest
+customization with DataSourceVMware will load
+DataSourceNone due to metadata is NOT available.
+
+This is mostly a re-post of PR#229, few differences are:
+1. Let ds decide if fallback is allowed, not always fall back
+   to previous cached LOCAL ds.
+2. No comparing instance-id of cached ds with previous instance-id
+   due to I think they are always identical.
+
+Fixes GH-3402
+
+(cherry picked from commit 9929a00580d50afc60bf4e0fb9f2f39d4f797b4b)
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+
+Conflicts:
+	cloudinit/sources/__init__.py
+	Conflicts because of changes in upstream source coming from
+	30d5e9a3358f4cbaced ("refactor: Use _unpickle rather than hasattr() in sources")
+---
+ cloudinit/sources/DataSourceVMware.py | 14 +++++++++-
+ cloudinit/sources/__init__.py         | 14 ++++++++++
+ cloudinit/stages.py                   | 40 +++++++++++++++++----------
+ 3 files changed, 53 insertions(+), 15 deletions(-)
+
+diff --git a/cloudinit/sources/DataSourceVMware.py b/cloudinit/sources/DataSourceVMware.py
+index 1591121d..2d5d42eb 100644
+--- a/cloudinit/sources/DataSourceVMware.py
++++ b/cloudinit/sources/DataSourceVMware.py
+@@ -197,7 +197,7 @@ class DataSourceVMware(sources.DataSource):
+                 break
+ 
+         if not self.data_access_method:
+-            LOG.error("failed to find a valid data access method")
++            LOG.debug("failed to find a valid data access method")
+             return False
+ 
+         LOG.info("using data access method %s", self._get_subplatform())
+@@ -291,6 +291,18 @@ class DataSourceVMware(sources.DataSource):
+             self.metadata["instance-id"] = str(id_file.read()).rstrip().lower()
+             return self.metadata["instance-id"]
+ 
++    def check_if_fallback_is_allowed(self):
++        if (
++            self.data_access_method
++            and self.data_access_method == DATA_ACCESS_METHOD_IMC
++            and is_vmware_platform()
++        ):
++            LOG.debug(
++                "Cache fallback is allowed for : %s", self._get_subplatform()
++            )
++            return True
++        return False
++
+     def get_public_ssh_keys(self):
+         for key_name in (
+             "public-keys-data",
+diff --git a/cloudinit/sources/__init__.py b/cloudinit/sources/__init__.py
+index c207b5ed..453801be 100644
+--- a/cloudinit/sources/__init__.py
++++ b/cloudinit/sources/__init__.py
+@@ -312,6 +312,10 @@ class DataSource(CloudInitPickleMixin, metaclass=abc.ABCMeta):
+             self.vendordata2_raw = None
+         if not hasattr(self, "skip_hotplug_detect"):
+             self.skip_hotplug_detect = False
++
++        if not hasattr(self, "check_if_fallback_is_allowed"):
++            setattr(self, "check_if_fallback_is_allowed", lambda: False)
++
+         if hasattr(self, "userdata") and self.userdata is not None:
+             # If userdata stores MIME data, on < python3.6 it will be
+             # missing the 'policy' attribute that exists on >=python3.6.
+@@ -914,6 +918,16 @@ class DataSource(CloudInitPickleMixin, metaclass=abc.ABCMeta):
+         # quickly (local check only) if self.instance_id is still
+         return False
+ 
++    def check_if_fallback_is_allowed(self):
++        """check_if_fallback_is_allowed()
++        Checks if a cached ds is allowed to be restored when no valid ds is
++        found in local mode by checking instance-id and searching valid data
++        through ds list.
++
++        @return True if a ds allows fallback, False otherwise.
++        """
++        return False
++
+     @staticmethod
+     def _determine_dsmode(candidates, default=None, valid=None):
+         # return the first candidate that is non None, warn if not valid
+diff --git a/cloudinit/stages.py b/cloudinit/stages.py
+index 3b6405f5..0b795624 100644
+--- a/cloudinit/stages.py
++++ b/cloudinit/stages.py
+@@ -353,20 +353,32 @@ class Init:
+             LOG.debug(myrep.description)
+ 
+         if not ds:
+-            util.del_file(self.paths.instance_link)
+-            (cfg_list, pkg_list) = self._get_datasources()
+-            # Deep copy so that user-data handlers can not modify
+-            # (which will affect user-data handlers down the line...)
+-            (ds, dsname) = sources.find_source(
+-                self.cfg,
+-                self.distro,
+-                self.paths,
+-                copy.deepcopy(self.ds_deps),
+-                cfg_list,
+-                pkg_list,
+-                self.reporter,
+-            )
+-            LOG.info("Loaded datasource %s - %s", dsname, ds)
++            try:
++                cfg_list, pkg_list = self._get_datasources()
++                # Deep copy so that user-data handlers can not modify
++                # (which will affect user-data handlers down the line...)
++                ds, dsname = sources.find_source(
++                    self.cfg,
++                    self.distro,
++                    self.paths,
++                    copy.deepcopy(self.ds_deps),
++                    cfg_list,
++                    pkg_list,
++                    self.reporter,
++                )
++                util.del_file(self.paths.instance_link)
++                LOG.info("Loaded datasource %s - %s", dsname, ds)
++            except sources.DataSourceNotFoundException as e:
++                if existing != "check":
++                    raise e
++                ds = self._restore_from_cache()
++                if ds and ds.check_if_fallback_is_allowed():
++                    LOG.info(
++                        "Restored fallback datasource from checked cache: %s",
++                        ds,
++                    )
++                else:
++                    raise e
+         self.datasource = ds
+         # Ensure we adjust our path members datasource
+         # now that we have one (thus allowing ipath to be used)
+-- 
+2.39.3
+

SOURCES/ci-fix-Undeprecate-network-in-schema-route-definition-5.patch

@@ -0,0 +1,42 @@
+From 8a83f1e6077cea9dc9ebc909e1332e15c8cbadac Mon Sep 17 00:00:00 2001
+From: James Falcon <james.falcon@canonical.com>
+Date: Tue, 19 Mar 2024 14:24:11 -0500
+Subject: [PATCH 3/3] fix: Undeprecate 'network' in schema route definition
+ (#5072)
+
+RH-Author: Ani Sinha <anisinha@redhat.com>
+RH-MergeRequest: 129: fix: Undeprecate 'network' in schema route definition (#5072)
+RH-Jira: RHEL-29710
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Acked-by: Cathy Avery <cavery@redhat.com>
+RH-Commit: [1/1] c482c3e11720f01daa7b0d37035157b062b35213
+
+It is passed through to our v1 schema from OpenStack network_data.json
+
+Fixes GH-5051
+
+(cherry picked from commit ff40d1af8a6de3ee27937382ec4ceea931d80a88)
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+---
+ cloudinit/config/schemas/schema-network-config-v1.json | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/cloudinit/config/schemas/schema-network-config-v1.json b/cloudinit/config/schemas/schema-network-config-v1.json
+index 56dc27c9..64c492a4 100644
+--- a/cloudinit/config/schemas/schema-network-config-v1.json
++++ b/cloudinit/config/schemas/schema-network-config-v1.json
+@@ -445,10 +445,7 @@
+         },
+         "network": {
+           "type": "string",
+-          "description": "IPv4 network address with CIDR netmask notation or IPv6 with prefix length. Alias for ``destination`` and only read when ``destination`` key is absent.",
+-          "deprecated": true,
+-          "deprecated_version": "23.3",
+-          "deprecated_description": "Use ``destination`` instead."
++          "description": "IPv4 network address with CIDR netmask notation or IPv6 with prefix length. Alias for ``destination`` and only read when ``destination`` key is absent. This exists for OpenStack support. OpenStack route definitions are passed through to v1 config and OpenStack's ``network_data.json`` uses ``network`` instead of ``destination``."
+         },
+         "destination": {
+           "type": "string",
+-- 
+2.41.0
+

SOURCES/ci-fix-clean-stop-warning-when-running-clean-command-47.patch

@@ -0,0 +1,132 @@
+From a622a094a1f497c87a66932382265c2dbf1b88a2 Mon Sep 17 00:00:00 2001
+From: d1r3ct0r <calvin.mwadime@canonical.com>
+Date: Sat, 20 Jan 2024 02:11:47 +0300
+Subject: [PATCH 1/2] fix(clean): stop warning when running clean command
+ (#4761)
+
+RH-Author: Ani Sinha <None>
+RH-MergeRequest: 121: fix(clean): stop warning when running clean command (#4761)
+RH-Jira: RHEL-21530
+RH-Acked-by: Cathy Avery <cavery@redhat.com>
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Commit: [1/2] f7a20c627afabf00db20c80ecd6e7f577053863b
+
+When the clean command is run, runparts is called and README in
+/etc/cloud/clean.d is not executable which leads to a warning.
+
+No longer deliver the README in our deb package, move content
+to our online docs. Continue to deliver the /etc/cloud/clean.d
+directory as it is used by installers like subiquity.
+
+Fixes: GH-4760
+(cherry picked from commit da08a260965e35fa63def1cd8b8b472f7c354ffe)
+
+There is a downstream only change that is squashed with the upstream commit.
+The spec file under `redhat/` has been updated so as to not include
+`/etc/cloud/clean.d/README` file. Otherwise, we shall see errors like the
+following during the build process:
+
+`error: File not found: /builddir/build/.../etc/cloud/clean.d/README`
+
+After a rebase, we can only maintain the downstream spec file change as
+the rest of it is clean cherry-pick from upstream.
+
+X-downstream-only: true
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+---
+ config/clean.d/README              | 18 ------------------
+ doc/rtd/reference/cli.rst          | 27 +++++++++++++++++++++++++++
+ packages/redhat/cloud-init.spec.in |  1 -
+ packages/suse/cloud-init.spec.in   |  1 -
+ 4 files changed, 27 insertions(+), 20 deletions(-)
+ delete mode 100644 config/clean.d/README
+
+diff --git a/config/clean.d/README b/config/clean.d/README
+deleted file mode 100644
+index 9b0feebe..00000000
+--- a/config/clean.d/README
++++ /dev/null
+@@ -1,18 +0,0 @@
+--- cloud-init's clean.d run-parts directory --
+-
+-This directory is provided for third party applications which need
+-additional configuration artifact cleanup from the filesystem when
+-the command `cloud-init clean` is invoked.
+-
+-The `cloud-init clean` operation is typically performed by image creators
+-when preparing a golden image for clone and redeployment. The clean command
+-removes any cloud-init semaphores, allowing cloud-init to treat the next
+-boot of this image as the "first boot". When the image is next booted
+-cloud-init will performing all initial configuration based on any valid
+-datasource meta-data and user-data.
+-
+-Any executable scripts in this subdirectory will be invoked in lexicographical
+-order with run-parts by the command: sudo cloud-init clean.
+-
+-Typical format of such scripts would be a ##-<some-app> like the following:
+-  /etc/cloud/clean.d/99-live-installer
+diff --git a/doc/rtd/reference/cli.rst b/doc/rtd/reference/cli.rst
+index 04e05c55..c36775a8 100644
+--- a/doc/rtd/reference/cli.rst
++++ b/doc/rtd/reference/cli.rst
+@@ -83,6 +83,33 @@ re-run all stages as it did on first boot.
+   config files for ssh daemon. Argument `network` removes all generated
+   config files for network. `all` removes config files of all types.
+ 
++.. note::
++
++   Cloud-init provides the directory :file:`/etc/cloud/clean.d/` for third party
++   applications which need additional configuration artifact cleanup from
++   the fileystem when the `clean` command is invoked.
++
++   The :command:`clean` operation is typically performed by image creators
++   when preparing a golden image for clone and redeployment. The clean command
++   removes any cloud-init semaphores, allowing cloud-init to treat the next
++   boot of this image as the "first boot". When the image is next booted
++   cloud-init will performing all initial configuration based on any valid
++   datasource meta-data and user-data.
++
++   Any executable scripts in this subdirectory will be invoked in lexicographical
++   order with run-parts when running the :command:`clean` command.
++
++   Typical format of such scripts would be a ##-<some-app> like the following:
++   :file:`/etc/cloud/clean.d/99-live-installer`
++
++   An example of a script is:
++
++   .. code-block:: bash
++
++      sudo rm -rf /var/lib/installer_imgs/
++      sudo rm -rf /var/log/installer/
++
++
+ .. _cli_collect_logs:
+ 
+ :command:`collect-logs`
+diff --git a/packages/redhat/cloud-init.spec.in b/packages/redhat/cloud-init.spec.in
+index 97e95096..accfb1b6 100644
+--- a/packages/redhat/cloud-init.spec.in
++++ b/packages/redhat/cloud-init.spec.in
+@@ -190,7 +190,6 @@ fi
+ # Configs
+ %config(noreplace)      %{_sysconfdir}/cloud/cloud.cfg
+ %dir                    %{_sysconfdir}/cloud/clean.d
+-%config(noreplace)      %{_sysconfdir}/cloud/clean.d/README
+ %dir                    %{_sysconfdir}/cloud/cloud.cfg.d
+ %config(noreplace)      %{_sysconfdir}/cloud/cloud.cfg.d/*.cfg
+ %config(noreplace)      %{_sysconfdir}/cloud/cloud.cfg.d/README
+diff --git a/packages/suse/cloud-init.spec.in b/packages/suse/cloud-init.spec.in
+index 62a9129b..fae3c12b 100644
+--- a/packages/suse/cloud-init.spec.in
++++ b/packages/suse/cloud-init.spec.in
+@@ -115,7 +115,6 @@ version_pys=$(cd "%{buildroot}" && find . -name version.py -type f)
+ 
+ # Configs
+ %dir                    %{_sysconfdir}/cloud/clean.d
+-%config(noreplace)      %{_sysconfdir}/cloud/clean.d/README
+ %config(noreplace) %{_sysconfdir}/cloud/cloud.cfg
+ %dir               %{_sysconfdir}/cloud/cloud.cfg.d
+ %config(noreplace) %{_sysconfdir}/cloud/cloud.cfg.d/*.cfg
+-- 
+2.41.0
+

SOURCES/ci-fix-cloudstack-Use-parsed-lease-file-for-virtual-rou.patch

@@ -0,0 +1,58 @@
+From 6e3c351b013dc2ac01035853229ffdfdafa3afa8 Mon Sep 17 00:00:00 2001
+From: Brett Holman <brett.holman@canonical.com>
+Date: Wed, 3 Jan 2024 09:11:40 -0700
+Subject: [PATCH] fix(cloudstack): Use parsed lease file for virtual router in
+ cloudstack
+
+RH-Author: Ani Sinha <anisinha@redhat.com>
+RH-MergeRequest: 137: fix(cloudstack): Use parsed lease file for virtual router in cloudstack
+RH-Jira: RHEL-40418
+RH-Acked-by: Cathy Avery <cavery@redhat.com>
+RH-Acked-by: Jon Maloy <jmaloy@redhat.com>
+RH-Commit: [1/1] 77f97c04432fffff125dc1725d66b33ae0ab4af8
+
+Fixes 5942f4023e2581a
+
+(cherry picked from commit cb36bf38b823f811a3e938ccffc03d7d13190095)
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+---
+ cloudinit/sources/DataSourceCloudStack.py | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/cloudinit/sources/DataSourceCloudStack.py b/cloudinit/sources/DataSourceCloudStack.py
+index fd2482a3..f752765d 100644
+--- a/cloudinit/sources/DataSourceCloudStack.py
++++ b/cloudinit/sources/DataSourceCloudStack.py
+@@ -229,18 +229,18 @@ def get_vr_address():
+         )
+         return latest_address
+ 
+-    # Try dhcp lease files next...
++    # Try dhcp lease files next
+     lease_file = dhcp.IscDhclient.get_latest_lease()
+-    if not lease_file:
+-        LOG.debug("No lease file found, using default gateway")
+-        return get_default_gateway()
+-
+-    lease_file = dhcp.IscDhclient.parse_dhcp_server_from_lease_file(lease_file)
+-    if not latest_address:
+-        # No virtual router found, fallback on default gateway
+-        LOG.debug("No DHCP found, using default gateway")
+-        return get_default_gateway()
+-    return latest_address
++    if lease_file:
++        latest_address = dhcp.IscDhclient.parse_dhcp_server_from_lease_file(
++            lease_file
++        )
++        if latest_address:
++            return latest_address
++
++    # No virtual router found, fallback to default gateway
++    LOG.debug("No DHCP found, using default gateway")
++    return get_default_gateway()
+ 
+ 
+ # Used to match classes to dependencies
+-- 
+2.39.3
+

SOURCES/ci-net-allow-dhcp6-configuration-from-generate_fallback.patch

@@ -0,0 +1,182 @@
+From 2942fb776cd1fc765089ebd0004e01dc2b3a5920 Mon Sep 17 00:00:00 2001
+From: Ani Sinha <anisinha@redhat.com>
+Date: Tue, 21 Nov 2023 13:57:15 +0530
+Subject: [PATCH 2/3] net: allow dhcp6 configuration from
+ generate_fallback_configuration()
+
+RH-Author: Ani Sinha <None>
+RH-MergeRequest: 119: net: allow dhcp6 configuration from generate_fallback_configuration()
+RH-Jira: RHEL-7277
+RH-Acked-by: Jon Maloy <jmaloy@redhat.com>
+RH-Acked-by: Cathy Avery <cavery@redhat.com>
+RH-Commit: [2/2] b067c813488dfddc79d8ebd5bb51894ff040c356
+
+This will make sure on Azure we can use both dhcp4 and dhcp6 when IMDS is not
+used. This is useful in situations where only ipv6 network is available and
+there is no dhcp4 running.
+
+This change is mostly a reversal of commit 29ed5f5b646ee and therefore,
+re-application of the commit 518047aea9 with some small changes.
+
+The issue that caused the reversal of 518047aea9 is fixed by the earlier commit:
+cab0eaf290af7 ("net/network_manager: do not set "may-fail" to False for both ipv4 and ipv6 dhcp")
+
+Fixes GH-4439
+
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+(cherry picked from commit 0264e969166846b2f5cf87ccdb051a3a795eca15)
+---
+ cloudinit/net/__init__.py        |  7 ++++++-
+ tests/unittests/net/test_init.py |  4 ++++
+ tests/unittests/test_net.py      | 24 +++++++++++++++++++++---
+ 3 files changed, 31 insertions(+), 4 deletions(-)
+
+diff --git a/cloudinit/net/__init__.py b/cloudinit/net/__init__.py
+index bf21633b..c0888f52 100644
+--- a/cloudinit/net/__init__.py
++++ b/cloudinit/net/__init__.py
+@@ -571,7 +571,12 @@ def generate_fallback_config(config_driver=None):
+         match = {
+             "macaddress": read_sys_net_safe(target_name, "address").lower()
+         }
+-    cfg = {"dhcp4": True, "set-name": target_name, "match": match}
++    cfg = {
++        "dhcp4": True,
++        "dhcp6": True,
++        "set-name": target_name,
++        "match": match,
++    }
+     if config_driver:
+         driver = device_driver(target_name)
+         if driver:
+diff --git a/tests/unittests/net/test_init.py b/tests/unittests/net/test_init.py
+index 561d5151..60a44186 100644
+--- a/tests/unittests/net/test_init.py
++++ b/tests/unittests/net/test_init.py
+@@ -261,6 +261,7 @@ class TestGenerateFallbackConfig(CiTestCase):
+                 "eth1": {
+                     "match": {"macaddress": mac},
+                     "dhcp4": True,
++                    "dhcp6": True,
+                     "set-name": "eth1",
+                 }
+             },
+@@ -278,6 +279,7 @@ class TestGenerateFallbackConfig(CiTestCase):
+                 "eth0": {
+                     "match": {"macaddress": mac},
+                     "dhcp4": True,
++                    "dhcp6": True,
+                     "set-name": "eth0",
+                 }
+             },
+@@ -293,6 +295,7 @@ class TestGenerateFallbackConfig(CiTestCase):
+             "ethernets": {
+                 "eth0": {
+                     "dhcp4": True,
++                    "dhcp6": True,
+                     "match": {"macaddress": mac},
+                     "set-name": "eth0",
+                 }
+@@ -359,6 +362,7 @@ class TestGenerateFallbackConfig(CiTestCase):
+             "ethernets": {
+                 "ens3": {
+                     "dhcp4": True,
++                    "dhcp6": True,
+                     "match": {"name": "ens3"},
+                     "set-name": "ens3",
+                 }
+diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
+index 54d053f3..e52c2497 100644
+--- a/tests/unittests/test_net.py
++++ b/tests/unittests/test_net.py
+@@ -4299,6 +4299,7 @@ class TestGenerateFallbackConfig(CiTestCase):
+             "ethernets": {
+                 "eth0": {
+                     "dhcp4": True,
++                    "dhcp6": True,
+                     "set-name": "eth0",
+                     "match": {
+                         "macaddress": "00:11:22:33:44:55",
+@@ -4383,6 +4384,9 @@ iface lo inet loopback
+ 
+ auto eth0
+ iface eth0 inet dhcp
++
++# control-alias eth0
++iface eth0 inet6 dhcp
+ """
+         self.assertEqual(expected.lstrip(), contents.lstrip())
+ 
+@@ -4472,6 +4476,9 @@ iface lo inet loopback
+ 
+ auto eth1
+ iface eth1 inet dhcp
++
++# control-alias eth1
++iface eth1 inet6 dhcp
+ """
+         self.assertEqual(expected.lstrip(), contents.lstrip())
+ 
+@@ -4695,7 +4702,9 @@ class TestRhelSysConfigRendering(CiTestCase):
+ #
+ BOOTPROTO=dhcp
+ DEVICE=eth1000
++DHCPV6C=yes
+ HWADDR=07-1c-c6-75-a4-be
++IPV6INIT=yes
+ ONBOOT=yes
+ TYPE=Ethernet
+ USERCTL=no
+@@ -5593,7 +5602,8 @@ class TestOpenSuseSysConfigRendering(CiTestCase):
+             expected_content = """
+ # Created by cloud-init automatically, do not edit.
+ #
+-BOOTPROTO=dhcp4
++BOOTPROTO=dhcp
++DHCLIENT6_MODE=managed
+ LLADDR=07-1c-c6-75-a4-be
+ STARTMODE=auto
+ """.lstrip()
+@@ -5979,7 +5989,11 @@ class TestNetworkManagerRendering(CiTestCase):
+ 
+                 [ipv4]
+                 method=auto
+-                may-fail=false
++                may-fail=true
++
++                [ipv6]
++                method=auto
++                may-fail=true
+ 
+                 """
+                 ),
+@@ -6245,6 +6259,9 @@ iface lo inet loopback
+ 
+ auto eth1000
+ iface eth1000 inet dhcp
++
++# control-alias eth1000
++iface eth1000 inet6 dhcp
+ """
+         self.assertEqual(expected.lstrip(), contents.lstrip())
+ 
+@@ -6304,6 +6321,7 @@ class TestNetplanNetRendering:
+                   ethernets:
+                     eth1000:
+                       dhcp4: true
++                      dhcp6: true
+                       match:
+                         macaddress: 07-1c-c6-75-a4-be
+                       set-name: eth1000
+@@ -7803,7 +7821,7 @@ class TestNetworkdNetRendering(CiTestCase):
+             Name=eth1000
+             MACAddress=07-1c-c6-75-a4-be
+             [Network]
+-            DHCP=ipv4"""
++            DHCP=yes"""
+         ).rstrip(" ")
+ 
+         expected = self.create_conf_dict(expected.splitlines())
+-- 
+2.41.0
+

SOURCES/ci-net-network_manager-do-not-set-may-fail-to-False-for.patch

@@ -0,0 +1,150 @@
+From 010cd58942c82e902bc02cb5a34074f6083fc890 Mon Sep 17 00:00:00 2001
+From: Ani Sinha <anisinha@redhat.com>
+Date: Thu, 23 Nov 2023 12:27:51 +0530
+Subject: [PATCH 1/3] net/network_manager: do not set "may-fail" to False for
+ both ipv4 and ipv6 dhcp
+
+RH-Author: Ani Sinha <None>
+RH-MergeRequest: 119: net: allow dhcp6 configuration from generate_fallback_configuration()
+RH-Jira: RHEL-7277
+RH-Acked-by: Jon Maloy <jmaloy@redhat.com>
+RH-Acked-by: Cathy Avery <cavery@redhat.com>
+RH-Commit: [1/2] be07418f69a4c461e2fa02a72b7b985053af9660
+
+If "may-fail" is set to False in the Network Manager keyfile for both ipv4
+and ipv6 for dhcp configuration, it essentially means both ipv4 and ipv6 network
+initialization using dhcp must succeed for the overall network configuration to
+succeed. This means, for environments where only ipv4 or ipv6 is available but
+not both and we need to configure both ipv4 and ipv6 dhcp, the overall
+network configuration will fail. This is not what we want. When both ipv4
+and ipv6 dhcp are configured, it is enough for the overall configuration to
+succeed if any one succeeds.
+Therefore, set "may-fail" to True for both ipv4 and ipv6 if and only if both
+ipv4 and ipv6 are configured as dhcp in the Network Manager keyfile and
+"may-fail" is set to False for both. If both ipv4 and ipv6 are configured
+in the keyfile and if for any of them "may-fail" is already set to True,then
+do nothing.
+All other cases remain same as before.
+
+Please see discussions in PR #4474.
+
+Co-authored-by: James Falcon <james.falcon@canonical.com>
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+(cherry picked from commit 29dd5ace73ad60c7452c39b840045fb47fe0711f)
+---
+ cloudinit/net/network_manager.py | 59 ++++++++++++++++++++++++++++++++
+ tests/unittests/test_net.py      |  8 ++---
+ 2 files changed, 63 insertions(+), 4 deletions(-)
+
+diff --git a/cloudinit/net/network_manager.py b/cloudinit/net/network_manager.py
+index 8374cfcc..8a99eb3a 100644
+--- a/cloudinit/net/network_manager.py
++++ b/cloudinit/net/network_manager.py
+@@ -71,6 +71,57 @@ class NMConnection:
+         if not self.config.has_option(section, option):
+             self.config[section][option] = value
+ 
++    def _config_option_is_set(self, section, option):
++        """
++        Checks if a config option is set. Returns True if it is,
++        else returns False.
++        """
++        return self.config.has_section(section) and self.config.has_option(
++            section, option
++        )
++
++    def _get_config_option(self, section, option):
++        """
++        Returns the value of a config option if its set,
++        else returns None.
++        """
++        if self._config_option_is_set(section, option):
++            return self.config[section][option]
++        else:
++            return None
++
++    def _change_set_config_option(self, section, option, value):
++        """
++        Overrides the value of a config option if its already set.
++        Else, if the config option is not set, it does nothing.
++        """
++        if self._config_option_is_set(section, option):
++            self.config[section][option] = value
++
++    def _set_mayfail_true_if_both_false_dhcp(self):
++        """
++        If for both ipv4 and ipv6, 'may-fail' is set to be False,
++        set it to True for both of them.
++        """
++        for family in ["ipv4", "ipv6"]:
++            if self._get_config_option(family, "may-fail") != "false":
++                # if either ipv4 or ipv6 sections are not set/configured,
++                # or if both are configured but for either ipv4 or ipv6,
++                # 'may-fail' is not 'false', do not do anything.
++                return
++            if self._get_config_option(family, "method") not in [
++                "dhcp",
++                "auto",
++            ]:
++                # if both v4 and v6 are not dhcp, do not do anything.
++                return
++
++        # If we landed here, it means both ipv4 and ipv6 are configured
++        # with dhcp/auto and both have 'may-fail' set to 'false'. So set
++        # both to 'true'.
++        for family in ["ipv4", "ipv6"]:
++            self._change_set_config_option(family, "may-fail", "true")
++
+     def _set_ip_method(self, family, subnet_type):
+         """
+         Ensures there's appropriate [ipv4]/[ipv6] for given family
+@@ -271,6 +322,14 @@ class NMConnection:
+             if family == "ipv4" and "mtu" in subnet:
+                 ipv4_mtu = subnet["mtu"]
+ 
++        # we do not want to set may-fail to false for both ipv4 and ipv6 dhcp
++        # at the at the same time. This will make the network configuration
++        # work only when both ipv4 and ipv6 dhcp succeeds. This may not be
++        # what we want. If we have configured both ipv4 and ipv6 dhcp, any one
++        # succeeding should be enough. Therefore, if "may-fail" is set to
++        # False for both ipv4 and ipv6 dhcp, set them both to True.
++        self._set_mayfail_true_if_both_false_dhcp()
++
+         if ipv4_mtu is None:
+             ipv4_mtu = device_mtu
+         if not ipv4_mtu == device_mtu:
+diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
+index 052b0674..54d053f3 100644
+--- a/tests/unittests/test_net.py
++++ b/tests/unittests/test_net.py
+@@ -1470,11 +1470,11 @@ NETWORK_CONFIGS = {
+ 
+                 [ipv4]
+                 method=auto
+-                may-fail=false
++                may-fail=true
+ 
+                 [ipv6]
+                 method=auto
+-                may-fail=false
++                may-fail=true
+ 
+                 """
+             ),
+@@ -1642,11 +1642,11 @@ NETWORK_CONFIGS = {
+ 
+                 [ipv6]
+                 method=auto
+-                may-fail=false
++                may-fail=true
+ 
+                 [ipv4]
+                 method=auto
+-                may-fail=false
++                may-fail=true
+ 
+                 """
+             ),
+-- 
+2.41.0
+

SOURCES/ci-net-nm-check-for-presence-of-ifcfg-files-when-nm-con.patch

@@ -0,0 +1,123 @@
+From ffc8f3fbb4c8c14a4ef2b6a99a9ea61da4bedde7 Mon Sep 17 00:00:00 2001
+From: Ani Sinha <anisinha@redhat.com>
+Date: Thu, 7 Dec 2023 02:39:51 +0530
+Subject: [PATCH 3/3] net/nm: check for presence of ifcfg files when nm
+ connection files are absent (#4645)
+
+RH-Author: Ani Sinha <None>
+RH-MergeRequest: 120: net/nm: check for presence of ifcfg files when nm connection files are absent (#4645)
+RH-Jira: RHEL-17610
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Acked-by: Jon Maloy <jmaloy@redhat.com>
+RH-Commit: [1/1] e0647418de8b70724a32500f26f544650d701404
+
+On systems that use network manager to manage connections and activate network
+interfaces, they may also use ifcfg files for configuring
+interfaces using ifcfg-rh network manager plugin. When network manager is used
+as the activator, we need to also check for the presence of ifcfg interface
+config file when the network manager connection file is absent and if ifcfg-rh
+plugin is present.
+Hence, with this change, network manager activator first tries to use network
+manager connection files to bring up or bring down the interface. If the
+connection files are not present and if ifcfg-rh plugin is present, it tries to
+use ifcfg files for the interface. If the plugin or the ifcfg files are not
+present, the activator fails to activate or deactivate the interface and it
+bails out with warning log.
+
+Fixes: GH-4640
+
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+(cherry picked from commit d1d5166895da471cff3606c70d4e8ab6eec1c006)
+---
+ cloudinit/net/activators.py      |  7 +++++++
+ cloudinit/net/network_manager.py | 33 ++++++++++++++++++++++++++++++--
+ 2 files changed, 38 insertions(+), 2 deletions(-)
+
+diff --git a/cloudinit/net/activators.py b/cloudinit/net/activators.py
+index e69da40d..dd858862 100644
+--- a/cloudinit/net/activators.py
++++ b/cloudinit/net/activators.py
+@@ -117,6 +117,13 @@ class NetworkManagerActivator(NetworkActivator):
+         from cloudinit.net.network_manager import conn_filename
+ 
+         filename = conn_filename(device_name)
++        if filename is None:
++            LOG.warning(
++                "Unable to find an interface config file. "
++                "Unable to bring up interface."
++            )
++            return False
++
+         cmd = ["nmcli", "connection", "load", filename]
+         if _alter_interface(cmd, device_name):
+             cmd = ["nmcli", "connection", "up", "filename", filename]
+diff --git a/cloudinit/net/network_manager.py b/cloudinit/net/network_manager.py
+index 8a99eb3a..76a0ac15 100644
+--- a/cloudinit/net/network_manager.py
++++ b/cloudinit/net/network_manager.py
+@@ -17,10 +17,12 @@ from typing import Optional
+ from cloudinit import subp, util
+ from cloudinit.net import is_ipv6_address, renderer, subnet_is_ipv6
+ from cloudinit.net.network_state import NetworkState
++from cloudinit.net.sysconfig import available_nm_ifcfg_rh
+ 
+ NM_RUN_DIR = "/etc/NetworkManager"
+ NM_LIB_DIR = "/usr/lib/NetworkManager"
+ NM_CFG_FILE = "/etc/NetworkManager/NetworkManager.conf"
++IFCFG_CFG_FILE = "/etc/sysconfig/network-scripts"
+ NM_IPV6_ADDR_GEN_CONF = """# This is generated by cloud-init. Do not edit.
+ #
+ [.config]
+@@ -442,7 +444,7 @@ class Renderer(renderer.Renderer):
+         for con_id, conn in self.connections.items():
+             if not conn.valid():
+                 continue
+-            name = conn_filename(con_id, target)
++            name = nm_conn_filename(con_id, target)
+             util.write_file(name, conn.dump(), 0o600)
+ 
+         # Select EUI64 to be used by default by NM for creating the address
+@@ -452,12 +454,39 @@ class Renderer(renderer.Renderer):
+         )
+ 
+ 
+-def conn_filename(con_id, target=None):
++def nm_conn_filename(con_id, target=None):
+     target_con_dir = subp.target_path(target, NM_RUN_DIR)
+     con_file = f"cloud-init-{con_id}.nmconnection"
+     return f"{target_con_dir}/system-connections/{con_file}"
+ 
+ 
++def sysconfig_conn_filename(devname, target=None):
++    target_con_dir = subp.target_path(target, IFCFG_CFG_FILE)
++    con_file = f"ifcfg-{devname}"
++    return f"{target_con_dir}/{con_file}"
++
++
++def conn_filename(devname):
++    """
++    This function returns the name of the interface config file.
++    It first checks for presence of network manager connection file.
++    If absent and ifcfg-rh plugin for network manager is available,
++    it returns the name of the ifcfg file if it is present. If the
++    plugin is not present or the plugin is present but ifcfg file is
++    not, it returns None.
++    This function is called from NetworkManagerActivator class in
++    activators.py.
++    """
++    conn_file = nm_conn_filename(devname)
++    # If the network manager connection file is absent, also check for
++    # presence of ifcfg files for the same interface (if nm-ifcfg-rh plugin is
++    # present, network manager can handle ifcfg files). If both network manager
++    # connection file and ifcfg files are absent, return None.
++    if not os.path.isfile(conn_file) and available_nm_ifcfg_rh():
++        conn_file = sysconfig_conn_filename(devname)
++    return conn_file if os.path.isfile(conn_file) else None
++
++
+ def cloud_init_nm_conf_filename(target=None):
+     target_con_dir = subp.target_path(target, NM_RUN_DIR)
+     conf_file = "30-cloud-init-ip6-addr-gen-mode.conf"
+-- 
+2.41.0
+

SOURCES/ci-test-jsonschema-Pin-jsonschema-version-4781.patch

@@ -0,0 +1,48 @@
+From c43791eeb00bc9000abff0125c18aa6a7e8b7160 Mon Sep 17 00:00:00 2001
+From: Brett Holman <brett.holman@canonical.com>
+Date: Tue, 16 Jan 2024 12:43:17 -0700
+Subject: [PATCH 2/2] test(jsonschema): Pin jsonschema version (#4781)
+
+RH-Author: Ani Sinha <None>
+RH-MergeRequest: 121: fix(clean): stop warning when running clean command (#4761)
+RH-Jira: RHEL-21530
+RH-Acked-by: Cathy Avery <cavery@redhat.com>
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Commit: [2/2] f864085d47723b3fb462c3b6fc6e24b90bf040aa
+
+Release 4.21.0 broke tests
+
+(cherry picked from commit 034a5cdf10582da0492321f861b2b8b42182a54e)
+---
+ requirements.txt      | 2 +-
+ test-requirements.txt | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/requirements.txt b/requirements.txt
+index edec46a7..a095de18 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -28,7 +28,7 @@ requests
+ jsonpatch
+ 
+ # For validating cloud-config sections per schema definitions
+-jsonschema
++jsonschema<=4.20.0
+ 
+ # Used by DataSourceVMware to inspect the host's network configuration during
+ # the "setup()" function.
+diff --git a/test-requirements.txt b/test-requirements.txt
+index 19488b94..46a98b4c 100644
+--- a/test-requirements.txt
++++ b/test-requirements.txt
+@@ -9,6 +9,6 @@ pytest!=7.3.2
+ pytest-cov
+ pytest-mock
+ setuptools
+-jsonschema
++jsonschema<=4.20.0
+ responses
+ passlib
+-- 
+2.41.0
+

SPECS/cloud-init.spec

@@ -0,0 +1,959 @@
+%{!?license: %global license %%doc}
+
+# The only reason we are archful is because dmidecode is ExclusiveArch
+# https://bugzilla.redhat.com/show_bug.cgi?id=1067089
+%global debug_package %{nil}
+
+Name:           cloud-init
+Version:        23.4
+Release:        7%{?dist}.8
+Summary:        Cloud instance init scripts
+
+Group:          System Environment/Base
+License:        GPLv3
+URL:            https://github.com/canonical/cloud-init
+Source0:        https://github.com/canonical/cloud-init/archive/refs/tags/%{version}.tar.gz
+Source1:        cloud-init-tmpfiles.conf
+
+Patch0003: 0003-Do-not-write-NM_CONTROLLED-no-in-generated-interface.patch
+Patch0004: 0004-include-NOZEROCONF-yes-in-etc-sysconfig-network.patch
+Patch0005: 0005-settings.py-update-settings-for-rhel.patch
+Patch0013: 0013-rhel-cloud.cfg-remove-ssh_genkeytypes-in-settings.py.patch
+# For RHEL-7277 - [RFE] [Azure][RHEL8][Network][cloud-init] Can not acquire IPv6 address
+Patch14: ci-net-network_manager-do-not-set-may-fail-to-False-for.patch
+# For RHEL-7277 - [RFE] [Azure][RHEL8][Network][cloud-init] Can not acquire IPv6 address
+Patch15: ci-net-allow-dhcp6-configuration-from-generate_fallback.patch
+# For RHEL-17610 - [RHEL-8] NetworkManagerActivator brings up interface failed when using sysconfig renderer
+Patch16: ci-net-nm-check-for-presence-of-ifcfg-files-when-nm-con.patch
+# For RHEL-21530 - [RHEL-8.10]subp.py[WARNING]: skipping /etc/cloud/clean.d/README when do cloud-init clean
+Patch17: ci-fix-clean-stop-warning-when-running-clean-command-47.patch
+# For RHEL-21530 - [RHEL-8.10]subp.py[WARNING]: skipping /etc/cloud/clean.d/README when do cloud-init clean
+Patch18: ci-test-jsonschema-Pin-jsonschema-version-4781.patch
+# For RHEL-22248 - [Azure][RHEL-8] cloud-init-23.4 cannot read "- Azure" datasource_list format
+Patch19: ci-Revert-Use-grep-for-faster-parsing-of-cloud-config-i.patch
+# For RHEL-21323 - [rhel-8] The schema WARNING info for network-config.json is not suitable in cloud-init-23.4
+Patch20: ci-ci-Pin-pytest-8.0.0.-4816.patch
+# For RHEL-21323 - [rhel-8] The schema WARNING info for network-config.json is not suitable in cloud-init-23.4
+Patch21: ci-fix-Add-types-to-network-v1-schema-4841.patch
+# For RHEL-21290 - Unknown lvalue 'ConditionEnvironment' in section 'Unit' for /usr/lib/systemd/system/cloud-init.target,cloud-init.service
+Patch22: ci-Revert-systemd-Standardize-cloud-init-systemd-enable.patch
+# For RHEL-28817 - [RHEL 8.10] cloud-init 23.4 returns 2 on recoverable errors instead of 0
+Patch23: ci-Retain-exit-code-in-cloud-init-status-for-recoverabl.patch
+# For RHEL-27134 - [rhel-8]cloud-init fails to configure DNS/search domains for network-config v1
+Patch24: ci-fix-Correct-v2-NetworkManager-route-rendering-4637.patch
+# For RHEL-27134 - [rhel-8]cloud-init fails to configure DNS/search domains for network-config v1
+Patch25: ci-feat-apply-global-DNS-to-interfaces-in-network-manag.patch
+# For RHEL-29710 - Suggest to backport patch ff40d1a to undeprecate 'network' in schema route definition [rhel-8.10.0.z]
+Patch26: ci-fix-Undeprecate-network-in-schema-route-definition-5.patch
+# For RHEL-32841 - [cloud-init][ESXi]VMware datasource resets on every boot causing it to lose network configuration [rhel-8.10.z]
+Patch27: ci-fix-Fall-back-to-cached-local-ds-if-no-valid-ds-foun.patch
+# For RHEL-36701 - DataSourceNoCloudNet not configurable via config files [rhel-8.10.z]
+Patch28: ci-fix-Always-use-single-datasource-if-specified-5098.patch
+# For RHEL-40418 - [Cloud-init] CloudstackDataSource cannot work with NetworkManager [rhel-8.10.z]
+Patch29: ci-fix-cloudstack-Use-parsed-lease-file-for-virtual-rou.patch
+# For RHEL-46013 - [RHEL-8] cloud-init fails to configure DNS search domains [rhel-8.10.z]
+Patch30: ci-feat-sysconfig-Add-DNS-from-interface-config-to-reso.patch
+# For RHEL-49742 - [Cloud-init] [RHEL-8.10] Password reset feature broken with CloudstackDataSource
+Patch31: ci-fix-Clean-cache-if-no-datasource-fallback-5499.patch
+# For RHEL-54155 - [RHEL 8.10] cloud-init schema validation fails.
+Patch32: ci-fix-Add-subnet-ipv4-ipv6-to-network-schema-5191.patch
+
+BuildArch:      noarch
+
+BuildRequires:  pkgconfig(systemd)
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+BuildRequires:  systemd
+
+# For tests
+BuildRequires:  iproute
+BuildRequires:  python3-configobj
+# # https://bugzilla.redhat.com/show_bug.cgi?id=1417029
+BuildRequires:  python3-httpretty >= 0.8.14-2
+BuildRequires:  python3-jinja2
+BuildRequires:  python3-jsonpatch
+BuildRequires:  python3-jsonschema
+BuildRequires:  python3-mock
+BuildRequires:  python3-nose
+BuildRequires:  python3-oauthlib
+BuildRequires:  python3-prettytable
+BuildRequires:  python3-pyserial
+BuildRequires:  python3-PyYAML
+BuildRequires:  python3-requests
+BuildRequires:  python3-six
+BuildRequires:  python3-unittest2
+# dnf is needed to make cc_ntp unit tests work
+# https://bugs.launchpad.net/cloud-init/+bug/1721573
+BuildRequires:  /usr/bin/dnf
+
+Requires:       e2fsprogs
+Requires:       iproute
+Requires:       libselinux-python3
+Requires:       policycoreutils-python3
+Requires:       procps
+Requires:       python3-configobj
+Requires:       python3-jinja2
+Requires:       python3-jsonpatch
+Requires:       python3-jsonschema
+Requires:       python3-oauthlib
+Requires:       python3-prettytable
+Requires:       python3-pyserial
+Requires:       python3-PyYAML
+Requires:       python3-requests
+Requires:       python3-six
+Requires:       shadow-utils
+Requires:       util-linux
+Requires:       xfsprogs
+Requires:       dhcp-client
+# https://bugzilla.redhat.com/show_bug.cgi?id=2039697
+Requires:       gdisk
+Requires:       openssl
+Requires:       python3-netifaces
+
+%{?systemd_requires}
+
+%description
+Cloud-init is a set of init scripts for cloud instances.  Cloud instances
+need special scripts to run during initialization to retrieve and install
+ssh keys and to let the user run various scripts.
+
+
+%prep
+%autosetup -p1
+
+# Change shebangs
+sed -i -e 's|#!/usr/bin/env python|#!/usr/bin/env python3|' \
+       -e 's|#!/usr/bin/python|#!/usr/bin/python3|' tools/* cloudinit/ssh_util.py
+
+%build
+%py3_build
+
+
+%install
+%py3_install --
+
+sed -i "s,@@PACKAGED_VERSION@@,%{version}-%{release}," $RPM_BUILD_ROOT/%{python3_sitelib}/cloudinit/version.py
+
+mkdir -p $RPM_BUILD_ROOT/var/lib/cloud
+
+# /run/cloud-init needs a tmpfiles.d entry
+mkdir -p $RPM_BUILD_ROOT/run/cloud-init
+mkdir -p $RPM_BUILD_ROOT/%{_tmpfilesdir}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT/%{_tmpfilesdir}/%{name}.conf
+
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rsyslog.d
+cp -p tools/21-cloudinit.conf $RPM_BUILD_ROOT/%{_sysconfdir}/rsyslog.d/21-cloudinit.conf
+
+
+[ ! -d $RPM_BUILD_ROOT/usr/lib/systemd/system-generators ] && mkdir -p $RPM_BUILD_ROOT/usr/lib/systemd/system-generators
+python3 tools/render-template --variant rhel systemd/cloud-init-generator.tmpl > $RPM_BUILD_ROOT/usr/lib/systemd/system-generators/cloud-init-generator
+chmod 755 $RPM_BUILD_ROOT/usr/lib/systemd/system-generators/cloud-init-generator
+
+# installing man pages
+mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1/
+for man in cloud-id.1 cloud-init.1 cloud-init-per.1; do
+    install -c -m 0644 doc/man/${man} ${RPM_BUILD_ROOT}%{_mandir}/man1/${man}
+    chmod -x ${RPM_BUILD_ROOT}%{_mandir}/man1/*
+done
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%post
+if [ $1 -eq 1 ] ; then
+    # Initial installation
+    # Enabled by default per "runs once then goes away" exception
+    /bin/systemctl enable cloud-config.service     >/dev/null 2>&1 || :
+    /bin/systemctl enable cloud-final.service      >/dev/null 2>&1 || :
+    /bin/systemctl enable cloud-init.service       >/dev/null 2>&1 || :
+    /bin/systemctl enable cloud-init-local.service >/dev/null 2>&1 || :
+    /bin/systemctl enable cloud-init.target        >/dev/null 2>&1 || :
+elif [ $1 -eq 2 ]; then
+    # Upgrade
+    # RHBZ 2210012 - check for null ssh_genkeytypes value in cloud.cfg that
+    # breaks ssh connectivity after upgrade to a newer version of cloud-init.
+    if [ -f  %{_sysconfdir}/cloud/cloud.cfg.rpmnew ] && grep -q '^\s*ssh_genkeytypes:\s*~\s*$'  %{_sysconfdir}/cloud/cloud.cfg ; then
+       echo "***********************************************"
+       echo "*** WARNING!!!! ***"
+       echo ""
+       echo "ssh_genkeytypes set to null in /etc/cloud/cloud.cfg!"
+       echo "SSH access might be broken after reboot. Please check the following KCS"
+       echo "for more detailed information:"
+       echo ""
+       echo "https://access.redhat.com/solutions/6988034"
+       echo ""
+       echo "Please reconcile the differences between /etc/cloud/cloud.cfg and "
+       echo "/etc/cloud/cloud.cfg.rpmnew and update ssh_genkeytypes configuration in "
+       echo "/etc/cloud/cloud.cfg to a list of keytype values, something like:"
+       echo "ssh_genkeytypes:  ['rsa', 'ecdsa', 'ed25519']"
+       echo ""
+       echo "************************************************"
+    fi
+    # If the upgrade is from a version older than 0.7.9-8,
+    # there will be stale systemd config
+    /bin/systemctl is-enabled cloud-config.service >/dev/null 2>&1 &&
+      /bin/systemctl reenable cloud-config.service >/dev/null 2>&1 || :
+
+    /bin/systemctl is-enabled cloud-final.service >/dev/null 2>&1 &&
+      /bin/systemctl reenable cloud-final.service >/dev/null 2>&1 || :
+
+    /bin/systemctl is-enabled cloud-init.service >/dev/null 2>&1 &&
+      /bin/systemctl reenable cloud-init.service >/dev/null 2>&1 || :
+
+    /bin/systemctl is-enabled cloud-init-local.service >/dev/null 2>&1 &&
+      /bin/systemctl reenable cloud-init-local.service >/dev/null 2>&1 || :
+
+    /bin/systemctl is-enabled cloud-init.target >/dev/null 2>&1 &&
+      /bin/systemctl reenable cloud-init.target >/dev/null 2>&1 || :
+fi
+
+%preun
+if [ $1 -eq 0 ] ; then
+    # Package removal, not upgrade
+    /bin/systemctl --no-reload disable cloud-config.service >/dev/null 2>&1 || :
+    /bin/systemctl --no-reload disable cloud-final.service  >/dev/null 2>&1 || :
+    /bin/systemctl --no-reload disable cloud-init.service   >/dev/null 2>&1 || :
+    /bin/systemctl --no-reload disable cloud-init-local.service >/dev/null 2>&1 || :
+    /bin/systemctl --no-reload disable cloud-init.target     >/dev/null 2>&1 || :
+    # One-shot services -> no need to stop
+fi
+
+%postun
+%systemd_postun cloud-config.service cloud-config.target cloud-final.service cloud-init.service cloud-init.target cloud-init-local.service
+
+if [ $1 -eq 0 ] ; then
+    # warn during package removal not upgrade
+    if [ -f /etc/ssh/sshd_config.d/50-cloud-init.conf ] ; then
+	echo "/etc/ssh/sshd_config.d/50-cloud-init.conf not removed"
+    fi
+
+    if [ -f /etc/NetworkManager/conf.d/99-cloud-init.conf ] ; then
+	echo "/etc/NetworkManager/conf.d/99-cloud-init.conf not removed"
+    fi
+
+    if [ -f /etc/NetworkManager/conf.d/30-cloud-init-ip6-addr-gen-mode.conf ] ; then
+	echo "/etc/NetworkManager/conf.d/30-cloud-init-ip6-addr-gen-mode.conf not removed"
+    fi
+fi
+
+%files
+%license LICENSE
+%config(noreplace) %{_sysconfdir}/cloud/cloud.cfg
+%dir               %{_sysconfdir}/cloud/cloud.cfg.d
+%config(noreplace) %{_sysconfdir}/cloud/cloud.cfg.d/*.cfg
+%doc               %{_sysconfdir}/cloud/cloud.cfg.d/README
+%dir               %{_sysconfdir}/cloud/templates
+%config(noreplace) %{_sysconfdir}/cloud/templates/*
+%{_unitdir}/cloud-config.service
+%{_unitdir}/cloud-config.target
+%{_unitdir}/cloud-final.service
+%{_unitdir}/cloud-init-hotplugd.service
+%{_unitdir}/cloud-init-hotplugd.socket
+%{_unitdir}/cloud-init-local.service
+%{_unitdir}/cloud-init.service
+%{_unitdir}/cloud-init.target
+%{_tmpfilesdir}/%{name}.conf
+%{python3_sitelib}/*
+%{_libexecdir}/%{name}
+%{_bindir}/cloud-init*
+%doc %{_datadir}/doc/%{name}
+%{_mandir}/man1/*
+%dir %verify(not mode) /run/cloud-init
+%dir /var/lib/cloud
+%{_udevrulesdir}/66-azure-ephemeral.rules
+%{_datadir}/bash-completion/completions/cloud-init
+%{_bindir}/cloud-id
+/usr/lib/systemd/system-generators/cloud-init-generator
+%{_sysconfdir}/systemd/system/sshd-keygen@.service.d/disable-sshd-keygen-if-cloud-init-active.conf
+
+
+%dir %{_sysconfdir}/rsyslog.d
+%config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf
+
+%changelog
+* Tue Aug 20 2024 Jon Maloy <jmaloy@redhat.com> - 23.4-7.el8_10.8
+- ci-fix-Add-subnet-ipv4-ipv6-to-network-schema-5191.patch [RHEL-54155]
+- Resolves: RHEL-54155
+  ([RHEL 8.10] cloud-init schema validation fails.)
+
+* Thu Jul 25 2024 Miroslav Rezanina <mrezanin@redhat.com> - 23.4-7.el8_10.7
+- ci-fix-Clean-cache-if-no-datasource-fallback-5499.patch [RHEL-49742]
+- Resolves: RHEL-49742
+  ([Cloud-init] [RHEL-8.10] Password reset feature broken with CloudstackDataSource)
+
+* Tue Jul 09 2024 Jon Maloy <jmaloy@redhat.com> - 23.4-7.el8_10.6
+- ci-feat-sysconfig-Add-DNS-from-interface-config-to-reso.patch [RHEL-46013]
+- Resolves: RHEL-46013
+  ([RHEL-8] cloud-init fails to configure DNS search domains [rhel-8.10.z])
+
+* Tue Jul 09 2024 Miroslav Rezanina <mrezanin@redhat.com> - 23.4-7.el8_10.5
+- ci-fix-cloudstack-Use-parsed-lease-file-for-virtual-rou.patch [RHEL-40418]
+- Resolves: RHEL-40418
+  ([Cloud-init] CloudstackDataSource cannot work with NetworkManager [rhel-8.10.z])
+
+* Wed May 29 2024 Jon Maloy <jmaloy@redhat.com> - 23.4-7.el8.3
+- ci-fix-Always-use-single-datasource-if-specified-5098.patch [RHEL-36701]
+- Resolves: RHEL-36701
+  (DataSourceNoCloudNet not configurable via config files [rhel-8.10.z])
+
+* Tue Apr 23 2024 Miroslav Rezanina <mrezanin@redhat.com> - 23.4-7.el8_10.2
+- ci-fix-Fall-back-to-cached-local-ds-if-no-valid-ds-foun.patch [RHEL-32841]
+- Resolves: RHEL-32841
+  ([cloud-init][ESXi]VMware datasource resets on every boot causing it to lose network configuration [rhel-8.10.z])
+
+* Fri Apr 05 2024 Jon Maloy <jmaloy@redhat.com> - 23.4-7.el8.1
+- ci-fix-Correct-v2-NetworkManager-route-rendering-4637.patch [RHEL-27134]
+- ci-feat-apply-global-DNS-to-interfaces-in-network-manag.patch [RHEL-27134]
+- ci-fix-Undeprecate-network-in-schema-route-definition-5.patch [RHEL-29710]
+- Resolves: RHEL-27134
+  ([rhel-8]cloud-init fails to configure DNS/search domains for network-config v1)
+- Resolves: RHEL-29710
+  (Suggest to backport patch ff40d1a to undeprecate 'network' in schema route definition [rhel-8.10.0.z])
+
+* Thu Mar 14 2024 Miroslav Rezanina <mrezanin@redhat.com> - 23.4-7
+- ci-Retain-exit-code-in-cloud-init-status-for-recoverabl.patch [RHEL-28817]
+- Resolves: RHEL-28817
+  ([RHEL 8.10] cloud-init 23.4 returns 2 on recoverable errors instead of 0)
+
+* Mon Mar 11 2024 Miroslav Rezanina <mrezanin@redhat.com> - 23.4-6
+- ci-Revert-systemd-Standardize-cloud-init-systemd-enable.patch [RHEL-21290]
+- Resolves: RHEL-21290
+  (Unknown lvalue 'ConditionEnvironment' in section 'Unit' for /usr/lib/systemd/system/cloud-init.target,cloud-init.service)
+
+* Mon Feb 26 2024 Miroslav Rezanina <mrezanin@redhat.com> - 23.4-5
+- ci-ci-Pin-pytest-8.0.0.-4816.patch [RHEL-21323]
+- ci-fix-Add-types-to-network-v1-schema-4841.patch [RHEL-21323]
+- Resolves: RHEL-21323
+  ([rhel-8] The schema WARNING info for network-config.json is not suitable in cloud-init-23.4)
+
+* Fri Feb 02 2024 Jon Maloy <jmaloy@redhat.com> - 23.4-4
+- ci-Revert-Use-grep-for-faster-parsing-of-cloud-config-i.patch [RHEL-22248]
+- Resolves: RHEL-22248
+  ([Azure][RHEL-8] cloud-init-23.4 cannot read "- Azure" datasource_list format)
+
+* Fri Feb 02 2024 Jon Maloy <jmaloy@redhat.com> - 23.4-3
+- ci-fix-clean-stop-warning-when-running-clean-command-47.patch [RHEL-21530]
+- ci-test-jsonschema-Pin-jsonschema-version-4781.patch [RHEL-21530]
+- Resolves: RHEL-21530
+  ([RHEL-8.10]subp.py[WARNING]: skipping /etc/cloud/clean.d/README when do cloud-init clean)
+
+* Tue Jan 16 2024 Jon Maloy <jmaloy@redhat.com> - 23.4-2
+- ci-net-network_manager-do-not-set-may-fail-to-False-for.patch [RHEL-7277]
+- ci-net-allow-dhcp6-configuration-from-generate_fallback.patch [RHEL-7277]
+- ci-net-nm-check-for-presence-of-ifcfg-files-when-nm-con.patch [RHEL-17610]
+- Resolves: RHEL-7277
+  ([RFE] [Azure][RHEL8][Network][cloud-init] Can not acquire IPv6 address)
+- Resolves: RHEL-17610
+  ([RHEL-8] NetworkManagerActivator brings up interface failed when using sysconfig renderer)
+
+* Mon Jan 8 2024 Jon Maloy <jmaloy@redhat.com> - 23.4-1
+- Rebase to 23.4.1 [RHEL-18314]
+- Resolves: RHEL-18314
+  ([RHEL-8]Rebase cloud-init to 23.4)
+
+* Thu Nov 23 2023 Camilla Conte <cconte@redhat.com> - 23.1.1-12
+- ci-rhel-cloud.cfg-remove-ssh_genkeytypes-in-settings.py.patch [RHEL-16572]
+- Resolves: RHEL-16572
+  ([cloud-init][rhel-8] Backport the patch "rhel/cloud.cfg: remove ssh_genkeytypes in settings.py and set in cloud.cfg" to fix settings.py)
+
+* Mon Sep 18 2023 Camilla Conte <cconte@redhat.com> - 23.1.1-11
+- ci-net-fix-ipv6_dhcpv6_stateful-stateless-slaac-configu.patch [bz#2046491]
+- Resolves: bz#2046491
+  (cloud-init enable both DHCPv4 and DHCPv6 when network type is ipv6_dhcpv6-stateful/ipv6_dhcpv6-stateless)
+- Resolves: RHEL-2325
+  ([RHEL8.9][cloud-init] Not inform user during upgrade that cloud-init generated config files are left )
+
+* Fri Aug 25 2023 Camilla Conte <cconte@redhat.com> - 23.1.1-10
+- Resolves: bz#2233047
+  ([RHEL 8.9] Inform user when cloud-init generated config files are left during uninstalling)
+
+* Wed Aug 09 2023 Jon Maloy <jmaloy@redhat.com> - 23.1.1-9
+- ci-NM-renderer-set-default-IPv6-addr-gen-mode-for-all-i.patch [bz#2229460]
+- Resolves: bz#2229460
+  ([rhel-8.9] [RFE] Configure "ipv6.addr-gen-mode=eui64' as default in NetworkManager)
+
+* Thu Jul 27 2023 Camilla Conte <cconte@redhat.com> - 23.1.1-8
+- ci-DS-VMware-modify-a-few-log-level-4284.patch [bz#2223810]
+- Resolves: bz#2223810
+  ([cloud-init] [RHEL8.9]There are warning logs if dev has more than one IPV6 address on ESXi)
+
+* Tue Jul 25 2023 Miroslav Rezanina <mrezanin@redhat.com> - 23.1.1-7
+- ci-logging-keep-current-file-mode-of-log-file-if-its-st.patch [bz#2222501]
+- Resolves: bz#2222501
+  (Don't change log permissions if they are already more restrictive [rhel-8])
+
+* Mon Jul 10 2023 Miroslav Rezanina <mrezanin@redhat.com> - 23.1.1-6
+- ci-Revert-Manual-revert-Use-Network-Manager-and-Netplan.patch [bz#2219528]
+- ci-Revert-Revert-Add-native-NetworkManager-support-1224.patch [bz#2219528]
+- ci-nm-generate-ipv6-stateful-dhcp-config-at-par-with-sy.patch [bz#2219528]
+- ci-network_manager-add-a-method-for-ipv6-static-IP-conf.patch [bz#2219528]
+- ci-net-sysconfig-enable-sysconfig-renderer-if-network-m.patch [bz#2219528]
+- ci-network-manager-Set-higher-autoconnect-priority-for-.patch [bz#2219528]
+- ci-Set-default-renderer-as-sysconfig-for-centos-rhel-41.patch [bz#2219528]
+- Resolves: bz#2219528
+  ([RHEL8] Support configuring network by NM keyfiles)
+
+* Thu Jun 29 2023 Jon Maloy <jmaloy@redhat.com> - 23.1.1-4
+- ci-Add-warning-during-upgrade-from-an-old-version-with-.patch [bz#2210012]
+- Resolves: bz#2210012
+  ([cloud-init] System didn't generate ssh host keys and lost ssh connection after cloud-init removed them with updated cloud-init package.)
+
+* Wed May 03 2023 Jon Maloy <jmaloy@redhat.com> - 23.1.1-3
+- ci-Don-t-change-permissions-of-netrules-target-2076.patch [bz#2182947]
+- ci-Make-user-vendor-data-sensitive-and-remove-log-permi.patch [bz#2190081]
+- Resolves: bz#2182947
+  (Request to backport "Don't change permissions of netrules target (#2076)")
+- Resolves: bz#2190081
+  (CVE-2023-1786 cloud-init: sensitive data could be exposed in logs [rhel-8])
+
+* Tue Apr 25 2023 Jon Maloy <jmaloy@redhat.com> - 23.1.1-2
+- ci-rhel-make-sure-previous-hostname-file-ends-with-a-ne.patch [bz#2182407]
+- Resolves: bz#2182407
+  (cloud-init strips new line from "/etc/hostname" when processing "/var/lib/cloud/data/previous-hostname")
+
+* Fri Apr 21 2023 Jon Maloy <jmaloy@redhat.com> - 23.1.1-1
+- limit-permissions-on-def_log_file.patch
+- Resolves bz#1424612
+- include-NOZEROCONF-yes-in-etc-sysconfig-network.patch
+- Resolves bz#1653131
+- Rebase to 23.1.1 [bz#2172821]
+- Resolves: bz#2172821
+
+* Mon Jan 30 2023 Camilla Conte <cconte@redhat.com> - 22.1-8
+- ci-cc_set_hostname-ignore-var-lib-cloud-data-set-hostna.patch [bz#2162258]
+- Resolves: bz#2162258
+  (systemd[1]: Failed to start Initial cloud-init job after reboot system via sysrq 'b' [RHEL-8])
+
+* Wed Dec 28 2022 Camilla Conte <cconte@redhat.com> - 22.1-7
+- ci-Ensure-network-ready-before-cloud-init-service-runs-.patch [bz#2151861]
+- Resolves: bz#2151861
+  ([RHEL-8] Ensure network ready before cloud-init service runs on RHEL)
+
+* Mon Oct 17 2022 Jon Maloy <jmaloy@redhat.com> - 22.1-6
+- ci-cloud.cfg.tmpl-make-sure-centos-settings-are-identic.patch [bz#2115576]
+- Resolves: bz#2115576
+  (cloud-init configures user "centos" or "rhel" instead of "cloud-user" with cloud-init-22.1)
+
+* Wed Aug 17 2022 Jon Maloy <jmaloy@redhat.com> - 22.1-5
+- ci-Revert-Add-native-NetworkManager-support-1224.patch [bz#2107464 bz#2110066 bz#2117526 bz#2104393 bz#2098624]
+- ci-Revert-Use-Network-Manager-and-Netplan-as-default-re.patch [bz#2107464 bz#2110066 bz#2117526 bz#2104393 bz#2098624]
+- Resolves: bz#2107464
+  ([RHEL-8.7] Cannot run sysconfig when changing the priority of network renderers)
+- Resolves: bz#2110066
+  (DNS integration with OpenStack/cloud-init/NetworkManager is not working)
+- Resolves: bz#2117526
+  ([RHEL8.7] Revert patch of configuring networking by NM keyfiles)
+- Resolves: bz#2104393
+  ([RHEL-8.7]Failed to config static IP and IPv6 according to VMware Customization Config File)
+- Resolves: bz#2098624
+  ([RHEL-8.7] IPv6 not workable when cloud-init configure network using NM keyfiles)
+
+* Tue Jul 12 2022 Miroslav Rezanina <mrezanin@redhat.com> - 22.1-4
+- ci-cloud-init.spec-adjust-path-for-66-azure-ephemeral.r.patch [bz#2096269]
+- ci-setup.py-adjust-udev-rules-default-path-1513.patch [bz#2096269]
+- Resolves: bz#2096269
+  (Adjust udev/rules default path[RHEL-8])
+
+* Thu Jun 23 2022 Jon Maloy <jmaloy@redhat.com> - 22.1-3
+- ci-Support-EC2-tags-in-instance-metadata-1309.patch [bz#2082686]
+- Resolves: bz#2082686
+  ([cloud][init] Add support for reading tags from instance metadata)
+
+* Tue May 31 2022 Jon Maloy <jmaloy@redhat.com> - 22.1-2
+- ci-Add-native-NetworkManager-support-1224.patch [bz#2059872]
+- ci-Use-Network-Manager-and-Netplan-as-default-renderers.patch [bz#2059872]
+- ci-Align-rhel-custom-files-with-upstream-1431.patch [bz#2082071]
+- ci-Remove-rhel-specific-files.patch [bz#2082071]
+- Resolves: bz#2059872
+  ([RHEL-8]Rebase cloud-init from Fedora so it can configure networking using NM keyfiles)
+- Resolves: bz#2082071
+  (Align cloud.cfg file and systemd with cloud-init upstream .tmpl files)
+
+* Mon Apr 25 2022 Amy Chen <xiachen@redhat.com> - 22.1-1
+- Rebaes to 22.1 [bz#2065544]
+- Resolves: bz#2065544
+  ([RHEL-8.7.0] cloud-init rebase to 22.1)
+
+* Fri Apr 01 2022 Camilla Conte <cconte@redhat.com> - 21.1-15
+- ci-Detect-a-Python-version-change-and-clear-the-cache-8.patch [bz#1935826]
+- ci-Fix-MIME-policy-failure-on-python-version-upgrade-93.patch [bz#1935826]
+- Resolves: bz#1935826
+  ([rhel-8] Cloud-init init stage fails after upgrade from RHEL7 to RHEL8.)
+
+* Fri Feb 25 2022 Jon Maloy <jmaloy@redhat.com> - 21.1-14
+- ci-Fix-IPv6-netmask-format-for-sysconfig-1215.patch [bz#2046540]
+- Resolves: bz#2046540
+  (cloud-init writes route6-$DEVICE config with a HEX netmask. ip route does not like : Error: inet6 prefix is expected rather than "fd00:fd00:fd00::/ffff:ffff:ffff:ffff::".)
+
+* Tue Jan 25 2022 Jon Maloy <jmaloy@redhat.com> - 21.1-13
+- ci-Add-flexibility-to-IMDS-api-version-793.patch [bz#2023940]
+- ci-Azure-helper-Ensure-Azure-http-handler-sleeps-betwee.patch [bz#2023940]
+- ci-azure-Removing-ability-to-invoke-walinuxagent-799.patch [bz#2023940]
+- ci-Azure-eject-the-provisioning-iso-before-reporting-re.patch [bz#2023940]
+- ci-Azure-Retrieve-username-and-hostname-from-IMDS-865.patch [bz#2023940]
+- ci-Azure-Retry-net-metadata-during-nic-attach-for-non-t.patch [bz#2023940]
+- ci-Azure-adding-support-for-consuming-userdata-from-IMD.patch [bz#2023940]
+- Resolves: bz#2023940
+  ([RHEL-8] Support for provisioning Azure VM with userdata)
+
+* Wed Jan 19 2022 Jon Maloy <jmaloy@redhat.com> - 21.1-12
+- ci-Add-gdisk-and-openssl-as-deps-to-fix-UEFI-Azure-init.patch [bz#2039697]
+- ci-Datasource-for-VMware-953.patch [bz#2026587]
+- ci-Change-netifaces-dependency-to-0.10.4-965.patch [bz#2026587]
+- ci-Update-dscheck_VMware-s-rpctool-check-970.patch [bz#2026587]
+- ci-Revert-unnecesary-lcase-in-ds-identify-978.patch [bz#2026587]
+- ci-Add-netifaces-package-as-a-Requires-in-cloud-init.sp.patch [bz#2026587]
+- Resolves: bz#2039697
+  ([RHEL8] [Azure] cloud-init fails to configure the system)
+- Resolves: bz#2026587
+  ([cloud-init][RHEL8] Support for cloud-init datasource 'cloud-init-vmware-guestinfo')
+
+* Wed Dec 08 2021 Jon Maloy <jmaloy@redhat.com> - 21.1-11
+- ci-cloudinit-net-handle-two-different-routes-for-the-sa.patch [bz#2028028]
+- Resolves: bz#2028028
+  ([RHEL-8] Above 19.2 of cloud-init fails to configure routes when configuring static and default routes to the same destination IP)
+
+* Mon Dec 06 2021 Jon Maloy <jmaloy@redhat.com> - 21.1-10
+- ci-fix-error-on-upgrade-caused-by-new-vendordata2-attri.patch [bz#2021538]
+- Resolves: bz#2021538
+  (cloud-init.service fails to start after package update)
+
+* Mon Oct 25 2021 Jon Maloy <jmaloy@redhat.com> - 21.1-9
+- ci-cc_ssh.py-fix-private-key-group-owner-and-permission.patch [bz#2013644]
+- Resolves: bz#2013644
+  (cloud-init fails to set host key permissions correctly)
+
+* Thu Sep 23 2021 Miroslav Rezanina <mrezanin@redhat.com> - 21.1-8
+- ci-ssh_utils.py-ignore-when-sshd_config-options-are-not.patch [bz#1862933]
+- Resolves: bz#1862933
+  (cloud-init fails with ValueError: need more than 1 value to unpack[rhel-8])
+
+* Fri Aug 27 2021 Miroslav Rezanina <mrezanin@redhat.com> - 21.1-7
+- ci-Fix-home-permissions-modified-by-ssh-module-SC-338-9.patch [bz#1995840]
+- Resolves: bz#1995840
+  ([cloudinit]  Fix home permissions modified by ssh module)
+
+* Wed Aug 11 2021 Miroslav Rezanina <mrezanin@redhat.com> - 21.1-6
+- ci-Stop-copying-ssh-system-keys-and-check-folder-permis.patch [bz#1862967]
+- Resolves: bz#1862967
+  ([cloud-init]Customize ssh AuthorizedKeysFile causes login failure)
+
+* Fri Aug 06 2021 Miroslav Rezanina <mrezanin@redhat.com> - 21.1-5
+- ci-Add-dhcp-client-as-a-dependency.patch [bz#1977385]
+- Resolves: bz#1977385
+  ([Azure][RHEL-8] cloud-init must require dhcp-client on Azure)
+
+* Mon Jul 19 2021 Miroslav Rezanina <mrezanin@redhat.com> - 21.1-4
+- ci-ssh-util-allow-cloudinit-to-merge-all-ssh-keys-into-.patch [bz#1862967]
+- Resolves: bz#1862967
+  ([cloud-init]Customize ssh AuthorizedKeysFile causes login failure)
+
+* Mon Jul 12 2021 Miroslav Rezanina <mrezanin@redhat.com> - 21.1-3
+- ci-write-passwords-only-to-serial-console-lock-down-clo.patch [bz#1945891]
+- Resolves: bz#1945891
+  (CVE-2021-3429 cloud-init: randomly generated passwords logged in clear-text to world-readable file [rhel-8])
+
+* Fri Jun 11 2021 Miroslav Rezanina <mrezanin@redhat.com> - 21.1-2
+- ci-rhel-cloud.cfg-remove-ssh_genkeytypes-in-settings.py.patch [bz#1957532]
+- ci-cloud-init.spec.template-update-systemd_postun-param.patch [bz#1952089]
+- Resolves: bz#1957532
+  ([cloud-init] From RHEL 82+ cloud-init no longer displays sshd keys fingerprints from instance launched from a backup image)
+- Resolves: bz#1952089
+  (cloud-init brew build fails on Fedora 33)
+
+* Thu May 27 2021 Miroslav Rezanina <mrezanin@redhat.com> - 21.1-1.el8
+- Rebaes to 21.1 [bz#1958174]
+- Resolves: bz#1958174
+  ([RHEL-8.5.0] Rebase cloud-init to 21.1)
+
+* Thu May 13 2021 Miroslav Rezanina <mrezanin@redhat.com> - 20.3-10.el8_4.3
+- ci-get_interfaces-don-t-exclude-Open-vSwitch-bridge-bon.patch [bz#1957135]
+- ci-net-exclude-OVS-internal-interfaces-in-get_interface.patch [bz#1957135]
+- Resolves: bz#1957135
+  (Intermittent failure to start cloud-init due to failure to detect macs [rhel-8.4.0.z])
+
+* Tue Apr 06 2021 Miroslav Rezanina <mrezanin@redhat.com> - 20.3-10.el8_4.1
+- ci-Fix-requiring-device-number-on-EC2-derivatives-836.patch [bz#1942699]
+- Resolves: bz#1942699
+  ([Aliyun][RHEL8.4][cloud-init] cloud-init service failed to start with Alibaba instance [rhel-8.4.0.z])
+
+* Tue Feb 02 2021 Miroslav Rezanina <mrezanin@redhat.com> - 20.3-10.el8
+- ci-fix-a-typo-in-man-page-cloud-init.1-752.patch [bz#1913127]
+- Resolves: bz#1913127
+  (A typo in cloud-init man page)
+
+* Tue Jan 26 2021 Miroslav Rezanina <mrezanin@redhat.com> - 20.3-9.el8
+- ci-DataSourceAzure-update-password-for-defuser-if-exist.patch [bz#1900892]
+- ci-Revert-ssh_util-handle-non-default-AuthorizedKeysFil.patch [bz#1919972]
+- Resolves: bz#1900892
+  ([Azure] Update existing user password RHEL8x)
+- Resolves: bz#1919972
+  ([RHEL-8.4] ssh keys can be shared across users giving potential root access)
+
+* Thu Jan 21 2021 Miroslav Rezanina <mrezanin@redhat.com> - 20.3-8.el8
+- ci-Missing-IPV6_AUTOCONF-no-to-render-sysconfig-dhcp6-s.patch [bz#1859695]
+- Resolves: bz#1859695
+  ([Cloud-init] DHCPv6 assigned address is not added to VM's interface)
+
+* Tue Jan 05 2021 Miroslav Rezanina <mrezanin@redhat.com> - 20.3-7.el8
+- ci-Report-full-specific-version-with-cloud-init-version.patch [bz#1898949]
+- Resolves: bz#1898949
+  (cloud-init should report full specific full version with "cloud-init --version")
+
+* Mon Dec 14 2020 Miroslav Rezanina <mrezanin@redhat.com> - 20.3-6.el8
+- ci-Installing-man-pages-in-the-correct-place-with-corre.patch [bz#1612573]
+- ci-Adding-BOOTPROTO-dhcp-to-render-sysconfig-dhcp6-stat.patch [bz#1859695]
+- ci-Fix-unit-failure-of-cloud-final.service-if-NetworkMa.patch [bz#1898943]
+- ci-ssh_util-handle-non-default-AuthorizedKeysFile-confi.patch [bz#1862967]
+- Resolves: bz#1612573
+  (Man page scan results for cloud-init)
+- Resolves: bz#1859695
+  ([Cloud-init] DHCPv6 assigned address is not added to VM's interface)
+- Resolves: bz#1898943
+  ([rhel-8]cloud-final.service fails if NetworkManager not installed.)
+- Resolves: bz#1862967
+  ([cloud-init]Customize ssh AuthorizedKeysFile causes login failure)
+
+* Fri Nov 27 2020 Miroslav Rezanina <mrezanin@redhat.com> - 20.3-5.el8
+- ci-network-Fix-type-and-respect-name-when-rendering-vla.patch [bz#1881462]
+- Resolves: bz#1881462
+  ([rhel8][cloud-init] ifup bond0.504 Error: Connection activation failed: No suitable device found for this connection)
+
+* Tue Nov 24 2020 Miroslav Rezanina <mrezanin@redhat.com> - 20.3-4.el8
+- ci-Changing-permission-of-cloud-init-generator-to-755.patch [bz#1897528]
+- Resolves: bz#1897528
+  (Change permission on ./systemd/cloud-init-generator.tmpl to 755 instead of 771)
+
+* Fri Nov 13 2020 Miroslav Rezanina <mrezanin@redhat.com> - 20.3-3.el8
+- ci--Removing-net-tools-dependency.patch [bz#1881871]
+- ci--Adding-man-pages-to-Red-Hat-spec-file.patch [bz#1612573]
+- Resolves: bz#1881871
+  (Remove net-tools legacy dependency from spec file)
+- Resolves: bz#1612573
+  (Man page scan results for cloud-init)
+
+* Tue Nov 03 2020 Miroslav Rezanina <mrezanin@redhat.com> - 20.3-2.el8
+- ci-Explicit-set-IPV6_AUTOCONF-and-IPV6_FORCE_ACCEPT_RA-.patch [bz#1889635]
+- ci-Add-config-modules-for-controlling-IBM-PowerVM-RMC.-.patch [bz#1886430]
+- Resolves: bz#1886430
+  (Support for cloud-init config modules for PowerVM Hypervisor in Red Hat cloud-init)
+- Resolves: bz#1889635
+  (Add support for ipv6_autoconf on cloud-init-20.3)
+
+* Fri Oct 23 2020 Eduardo Otubo <otubo@redhat.com> - 20.3-1.el8
+- Rebase to cloud-init 20.3 [bz#1885185]
+- Resolves: bz#1885185
+  ([RHEL-8.4.0] cloud-init rebase to 20.3)
+
+* Wed Sep 02 2020 Miroslav Rezanina <mrezanin@redhat.com> - 19.4-11.el8
+- ci-cc_mounts-fix-incorrect-format-specifiers-316.patch [bz#1794664]
+- Resolves: bz#1794664
+  ([RHEL8] swapon fails with "swapfile has holes" when created on a xfs filesystem by cloud-init)
+
+* Mon Aug 31 2020 Miroslav Rezanina <mrezanin@redhat.com> - 19.4-10.el8
+- ci-Changing-notation-of-subp-call.patch [bz#1839662]
+- Resolves: bz#1839662
+  ([ESXi][RHEL8.3][cloud-init]ERROR log in cloud-init.log after clone VM on ESXi platform)
+
+* Mon Aug 24 2020 Miroslav Rezanina <mrezanin@redhat.com> - 19.4-9.el8
+- ci-Do-not-use-fallocate-in-swap-file-creation-on-xfs.-7.patch [bz#1794664]
+- ci-swap-file-size-being-used-before-checked-if-str-315.patch [bz#1794664]
+- ci-Detect-kernel-version-before-swap-file-creation-428.patch [bz#1794664]
+- Resolves: bz#1794664
+  ([RHEL8] swapon fails with "swapfile has holes" when created on a xfs filesystem by cloud-init)
+
+* Mon Aug 17 2020 Miroslav Rezanina <mrezanin@redhat.com> - 19.4-8.el8
+- ci-When-tools.conf-does-not-exist-running-cmd-vmware-to.patch [bz#1839662]
+- ci-ssh-exit-with-non-zero-status-on-disabled-user-472.patch [bz#1833874]
+- Resolves: bz#1833874
+  ([rhel-8.3]using root user error should cause a non-zero exit code)
+- Resolves: bz#1839662
+  ([ESXi][RHEL8.3][cloud-init]ERROR log in cloud-init.log after clone VM on ESXi platform)
+
+* Fri Jun 26 2020 Miroslav Rezanina <mrezanin@redhat.com> - 19.4-7.el8
+- Fixing cloud-init-generator permissions [bz#1834173]
+- Resolves: bz#1834173
+  ([rhel-8.3]Incorrect ds-identify check in cloud-init-generator)
+
+* Thu Jun 25 2020 Miroslav Rezanina <mrezanin@redhat.com> - 19.4-6.el8
+- ci-ec2-only-redact-token-request-headers-in-logs-avoid-.patch [bz#1822343]
+- Resolves: bz#1822343
+  ([RHEL8.3] Do not log IMDSv2 token values into cloud-init.log)
+
+* Wed Jun 24 2020 Miroslav Rezanina <mrezanin@redhat.com> - 19.4-5.el8
+- ci-ec2-Do-not-log-IMDSv2-token-values-instead-use-REDAC.patch [bz#1822343]
+- ci-Render-the-generator-from-template-instead-of-cp.patch [bz#1834173]
+- ci-Change-from-redhat-to-rhel-in-systemd-generator-tmpl.patch [bz#1834173]
+- ci-cloud-init.service.tmpl-use-rhel-instead-of-redhat-4.patch [bz#1834173]
+- Resolves: bz#1822343
+  ([RHEL8.3] Do not log IMDSv2 token values into cloud-init.log)
+- Resolves: bz#1834173
+  ([rhel-8.3]Incorrect ds-identify check in cloud-init-generator)
+
+* Tue Jun 09 2020 Miroslav Rezanina <mrezanin@redhat.com> - 19.4-4.el8
+- ci-changing-ds-identify-patch-from-usr-lib-to-usr-libex.patch [bz#1834173]
+- Resolves: bz#1834173
+  ([rhel-8.3]Incorrect ds-identify check in cloud-init-generator)
+
+* Mon Jun 01 2020 Miroslav Rezanina <mrezanin@redhat.com> - 19.4-3.el8
+- ci-Make-cloud-init.service-execute-after-network-is-up.patch [bz#1803928]
+- Resolves: bz#1803928
+  ([RHEL8.3] Race condition of starting cloud-init and NetworkManager)
+
+* Thu May 28 2020 Miroslav Rezanina <mrezanin@redhat.com> - 19.4-2.el8
+- ci-cc_set_password-increase-random-pwlength-from-9-to-2.patch [bz#1812171]
+- ci-utils-use-SystemRandom-when-generating-random-passwo.patch [bz#1812174]
+- ci-Enable-ssh_deletekeys-by-default.patch [bz#1814152]
+- ci-Remove-race-condition-between-cloud-init-and-Network.patch [bz#1840648]
+- Resolves: bz#1812171
+  (CVE-2020-8632 cloud-init: Too short random password length in cc_set_password in config/cc_set_passwords.py [rhel-8])
+- Resolves: bz#1812174
+  (CVE-2020-8631 cloud-init: Use of random.choice when generating random password [rhel-8])
+- Resolves: bz#1814152
+  (CVE-2018-10896 cloud-init: default configuration disabled deletion of SSH host keys [rhel-8])
+- Resolves: bz#1840648
+  ([cloud-init][RHEL-8.2.0] /etc/resolv.conf lose config after reboot (initial instance is ok))
+
+* Mon Apr 20 2020 Miroslav Rezanina <mrezanin@redhat.coM> - 19.4-1.el8.1
+- Rebase to cloud-init 19.4 [bz#1811912]
+- Resolves: bz#1811912
+  ([RHEL-8.2.1] cloud-init rebase to 19.4)
+
+* Tue Mar 10 2020 Miroslav Rezanina <mrezanin@redhat.com> - 18.5-12.el8
+- ci-Remove-race-condition-between-cloud-init-and-Network.patch [bz#1807797]
+- Resolves: bz#1807797
+  ([cloud-init][RHEL-8.2.0] /etc/resolv.conf lose config after reboot (initial instance is ok))
+
+* Thu Feb 20 2020 Miroslav Rezanina <mrezanin@redhat.com> - 18.5-11.el8
+- ci-azure-avoid-re-running-cloud-init-when-instance-id-i.patch [bz#1788684]
+- ci-net-skip-bond-interfaces-in-get_interfaces.patch [bz#1768770]
+- ci-net-add-is_master-check-for-filtering-device-list.patch [bz#1768770]
+- Resolves: bz#1768770
+  (cloud-init complaining about enslaved mac)
+- Resolves: bz#1788684
+  ([RHEL-8] cloud-init Azure byte swap (hyperV Gen2 Only))
+
+* Thu Feb 13 2020 Miroslav Rezanina <mrezanin@redhat.com> - 18.5-10.el8
+- ci-cmd-main.py-Fix-missing-modules-init-key-in-modes-di.patch [bz#1802140]
+- Resolves: bz#1802140
+  ([cloud-init][RHEL8.2]cloud-init cloud-final.service fail with KeyError: 'modules-init' after upgrade to version 18.2-1.el7_6.1 in RHV)
+
+* Tue Jan 28 2020 Miroslav Rezanina <mrezanin@redhat.com> - 18.5-9.el8
+- ci-Removing-cloud-user-from-wheel.patch [bz#1785648]
+- Resolves: bz#1785648
+  ([RHEL8]cloud-user added to wheel group and sudoers.d causes 'sudo -v' prompts for passphrase)
+
+* Fri Nov 22 2019 Miroslav Rezanina <mrezanin@redhat.com> - 18.5-8.el8
+- ci-Fix-for-network-configuration-not-persisting-after-r.patch [bz#1706482]
+- ci-util-json.dumps-on-python-2.7-will-handle-UnicodeDec.patch [bz#1744718]
+- Resolves: bz#1706482
+  ([cloud-init][RHVM]cloud-init network configuration does not persist reboot [RHEL 8.2.0])
+- Resolves: bz#1744718
+  ([cloud-init][RHEL8][OpenStack] cloud-init can't persist instance-data.json)
+
+* Mon Jul 15 2019 Miroslav Rezanina <mrezanin@redhat.com> - 18.5-7.el8
+- Fixing TPS [bz#1729864]
+- Resolves: bz#1729864
+ (cloud-init tps fail)
+
+* Thu Jul 04 2019 Miroslav Rezanina <mrezanin@redhat.com> - 18.5-6.el8
+- ci-Revert-azure-ensure-that-networkmanager-hook-script-.patch [bz#1692914]
+- ci-Azure-Return-static-fallback-address-as-if-failed-to.patch [bz#1691986]
+- Resolves: bz#1691986
+  ([Azure] [RHEL 8.1] Cloud-init fixes to support fast provisioning for Azure)
+- Resolves: bz#1692914
+  ([8.1] [WALA][cloud] cloud-init dhclient-hook script has some unexpected side-effects on Azure)
+
+* Mon Jun 03 2019 Miroslav Rezanina <mrezanin@redhat.com> - 18.5-4.el8
+- ci-Azure-Ensure-platform-random_seed-is-always-serializ.patch [bz#1691986]
+- ci-DatasourceAzure-add-additional-logging-for-azure-dat.patch [bz#1691986]
+- ci-Azure-Changes-to-the-Hyper-V-KVP-Reporter.patch [bz#1691986]
+- ci-DataSourceAzure-Adjust-timeout-for-polling-IMDS.patch [bz#1691986]
+- ci-cc_mounts-check-if-mount-a-on-no-change-fstab-path.patch [bz#1691986]
+- Resolves: bz#1691986
+  ([Azure] [RHEL 8.1] Cloud-init fixes to support fast provisioning for Azure)
+
+* Tue Apr 16 2019 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - 18.5-3.el8
+- ci-Adding-gating-tests-for-Azure-ESXi-and-AWS.patch [bz#1682786]
+- Resolves: bz#1682786
+  (cloud-init changes blocked until gating tests are added)
+
+* Wed Apr 10 2019 Danilo C. L. de Paula <ddepaula@redhat.com> - 18.5-2
+- Adding gating.yaml file
+- Resolves: rhbz#1682786
+  (cloud-init changes blocked until gating tests are added)
+
+
+* Wed Apr 10 2019 Danilo de Paula <ddepaula@redhat.com: - 18.5-1.el8
+- Rebase to cloud-init 18.5
+- Resolves: bz#1687563
+  (cloud-init 18.5 rebase for fast provisioning on Azure [RHEL 8.0.1])
+
+* Wed Jan 23 2019 Miroslav Rezanina <mrezanin@redhat.com> - 18.2-6.el8
+- ci-net-Make-sysconfig-renderer-compatible-with-Network-.patch [bz#1602784]
+- Resolves: bz#1602784
+  (cloud-init: Sometimes image boots fingerprints is configured, there's a network device present but it's not configured)
+
+* Fri Jan 18 2019 Miroslav Rezanina <mrezanin@redhat.com> - 18.2-5.el8
+- ci-Fix-string-missmatch-when-mounting-ntfs.patch [bz#1664227]
+- Resolves: bz#1664227
+  ([Azure]String missmatch causes the /dev/sdb1 mounting failed after stop&start VM)
+
+* Thu Jan 10 2019 Miroslav Rezanina <mrezanin@redhat.com> - 18.2-4.el8
+- ci-Enable-cloud-init-by-default-on-vmware.patch [bz#1644335]
+- Resolves: bz#1644335
+  ([ESXi][RHEL8.0]Enable cloud-init by default on VMware)
+
+* Wed Nov 28 2018 Miroslav Rezanina <mrezanin@redhat.com> - 18.2-3.el8
+- ci-Adding-systemd-mount-options-to-wait-for-cloud-init.patch [bz#1615599]
+- ci-Azure-Ignore-NTFS-mount-errors-when-checking-ephemer.patch [bz#1615599]
+- ci-azure-Add-reported-ready-marker-file.patch [bz#1615599]
+- ci-Adding-disk_setup-to-rhel-cloud.cfg.patch [bz#1615599]
+- Resolves: bz#1615599
+  ([Azure] cloud-init fails to mount /dev/sdb1 after stop(deallocate)&&start VM)
+
+* Tue Nov 06 2018 Miroslav Rezanina <mrezanin@redhat.com> - 18.2-2.el7
+- Revert "remove 'tee' command from logging configuration" [bz#1626117]
+- Resolves: rhbz#1626117]
+  (cloud-init-0.7.9-9 doesn't feed cloud-init-output.log)
+
+* Fri Jun 29 2018 Miroslav Rezanina <mrezanin@redhat.com> - 18.2-1.el7
+- Rebase to 18.2 [bz#1515909]
+  Resolves: rhbz#1515909
+
+* Tue Feb 13 2018 Ryan McCabe <rmccabe@redhat.com> 0.7.9-24
+- Set DHCP_HOSTNAME on Azure to allow for the hostname to be
+  published correctly when bouncing the network.
+  Resolves: rhbz#1434109
+
+* Mon Jan 15 2018 Ryan McCabe <rmccabe@redhat.com> 0.7.9-23
+- Fix a bug tha caused cloud-init to fail as a result of trying
+  to rename bonds.
+  Resolves: rhbz#1512247
+
+* Mon Jan 15 2018 Ryan McCabe <rmccabe@redhat.com> 0.7.9-22
+- Apply patch from -21
+  Resolves: rhbz#1489270
+
+* Mon Jan 15 2018 Ryan McCabe <rmccabe@redhat.com> 0.7.9-21
+- sysconfig: Fix a potential traceback introduced in the
+  0.7.9-17 build
+  Resolves: rhbz#1489270
+
+* Sun Dec 17 2017 Ryan McCabe <rmccabe@redhat.com> 0.7.9-20
+- sysconfig: Correct rendering for dhcp on ipv6
+  Resolves: rhbz#1519271
+
+* Thu Nov 30 2017 Ryan McCabe <rmccabe@redhat.com> 0.7.9-19
+- sysconfig: Fix rendering of default gateway for ipv6
+  Resolves: rhbz#1492726
+
+* Fri Nov 24 2017 Ryan McCabe <rmccabe@redhat.com> 0.7.9-18
+- Start the cloud-init init local service after the dbus socket is created
+  so that the hostnamectl command works.
+  Resolves: rhbz#1450521
+
+* Tue Nov 21 2017 Ryan McCabe <rmccabe@redhat.com> 0.7.9-17
+- Correctly render DNS and DOMAIN for sysconfig
+  Resolves: rhbz#1489270
+
+* Mon Nov 20 2017 Ryan McCabe <rmccabe@redhat.com> 0.7.9-16
+- Disable NetworkManager management of resolv.conf if nameservers
+  are specified by configuration.
+  Resolves: rhbz#1454491
+
+* Mon Nov 13 2017 Ryan McCabe <rmccabe@redhat.com> 0.7.9-15
+- Fix a null reference error in the rh_subscription module
+  Resolves: rhbz#1498974
+
+* Mon Nov 13 2017 Ryan McCabe <rmccabe@redhat.com> 0-7.9-14
+- Include gateway if it's included in subnet configration
+  Resolves: rhbz#1492726
+
+* Sun Nov 12 2017 Ryan McCabe <rmccabe@redhat.com> 0-7.9-13
+- Do proper cleanup of systemd units when upgrading from versions
+  0.7.9-3 through 0.7.9-8.
+  Resolves: rhbz#1465730
+
+* Thu Nov 09 2017 Ryan McCabe <rmccabe@redhat.com> 0.7.9-12
+- Prevent Azure NM and dhclient hooks from running when cloud-init is
+  disabled (rhbz#1474226)
+
+* Tue Oct 31 2017 Ryan McCabe <rmccabe@redhat.com> 0.7.9-11
+- Fix rendering of multiple static IPs per interface file
+  Resolves: rhbz#bz1497954
+
+* Tue Sep 26 2017 Ryan McCabe <rmccabe@redhat.com> 0.7.9-10
+- AliCloud: Add support for the Alibaba Cloud datasource (rhbz#1482547)
+
+* Thu Jun 22 2017 Lars Kellogg-Stedman <lars@redhat.com> 0.7.9-9
+- RHEL/CentOS: Fix default routes for IPv4/IPv6 configuration. (rhbz#1438082)
+- azure: ensure that networkmanager hook script runs (rhbz#1440831 rhbz#1460206)
+- Fix ipv6 subnet detection (rhbz#1438082)
+
+* Tue May 23 2017 Lars Kellogg-Stedman <lars@redhat.com> 0.7.9-8
+- Update patches
+
+* Mon May 22 2017 Lars Kellogg-Stedman <lars@redhat.com> 0.7.9-7
+- Add missing sysconfig unit test data (rhbz#1438082)
+- Fix dual stack IPv4/IPv6 configuration for RHEL (rhbz#1438082)
+- sysconfig: Raise ValueError when multiple default gateways are present. (rhbz#1438082)
+- Bounce network interface for Azure when using the built-in path. (rhbz#1434109)
+- Do not write NM_CONTROLLED=no in generated interface config files (rhbz#1385172)
+
+* Wed May 10 2017 Lars Kellogg-Stedman <lars@redhat.com> 0.7.9-6
+- add power-state-change module to cloud_final_modules (rhbz#1252477)
+- remove 'tee' command from logging configuration (rhbz#1424612)
+- limit permissions on def_log_file (rhbz#1424612)
+- Bounce network interface for Azure when using the built-in path. (rhbz#1434109)
+- OpenStack: add 'dvs' to the list of physical link types. (rhbz#1442783)
+
+* Wed May 10 2017 Lars Kellogg-Stedman <lars@redhat.com> 0.7.9-5
+- systemd: replace generator with unit conditionals (rhbz#1440831)
+
+* Thu Apr 13 2017 Charalampos Stratakis <cstratak@redhat.com> 0.7.9-4
+- Import to RHEL 7
+Resolves: rhbz#1427280
+
+* Tue Mar 07 2017 Lars Kellogg-Stedman <lars@redhat.com> 0.7.9-3
+- fixes for network config generation
+- avoid dependency cycle at boot (rhbz#1420946)
+
+* Tue Jan 17 2017 Lars Kellogg-Stedman <lars@redhat.com> 0.7.9-2
+- use timeout from datasource config in openstack get_data (rhbz#1408589)
+
+* Thu Dec 01 2016 Lars Kellogg-Stedman <lars@redhat.com> - 0.7.9-1
+- Rebased on upstream 0.7.9.
+- Remove dependency on run-parts
+
+* Wed Jan 06 2016 Lars Kellogg-Stedman <lars@redhat.com> - 0.7.6-8
+- make rh_subscription plugin do nothing in the absence of a valid
+  configuration [RH:1295953]
+- move rh_subscription module to cloud_config stage
+
+* Wed Jan 06 2016 Lars Kellogg-Stedman <lars@redhat.com> - 0.7.6-7
+- correct permissions on /etc/ssh/sshd_config [RH:1296191]
+
+* Thu Sep 03 2015 Lars Kellogg-Stedman <lars@redhat.com> - 0.7.6-6
+- rebuild for ppc64le
+
+* Tue Jul 07 2015 Lars Kellogg-Stedman <lars@redhat.com> - 0.7.6-5
+- bump revision for new build
+
+* Tue Jul 07 2015 Lars Kellogg-Stedman <lars@redhat.com> - 0.7.6-4
+- ensure rh_subscription plugin is enabled by default
+
+* Wed Apr 29 2015 Lars Kellogg-Stedman <lars@redhat.com> - 0.7.6-3
+- added dependency on python-jinja2 [RH:1215913]
+- added rhn_subscription plugin [RH:1227393]
+- require pyserial to support smartos data source [RH:1226187]
+
+* Fri Jan 16 2015 Lars Kellogg-Stedman <lars@redhat.com> - 0.7.6-2
+- Rebased RHEL version to Fedora rawhide
+- Backported fix for https://bugs.launchpad.net/cloud-init/+bug/1246485
+- Backported fix for https://bugs.launchpad.net/cloud-init/+bug/1411829
+
+* Fri Nov 14 2014 Colin Walters <walters@redhat.com> - 0.7.6-1
+- New upstream version [RH:974327]
+- Drop python-cheetah dependency (same as above bug)

cloud-init.spec

@@ -1,461 +0,0 @@
-%if 0%{?rhel}
-%bcond_with tests
-%else
-%bcond_without tests
-%endif
-
-Name:           cloud-init
-Version:        24.4
-Release:        1%{?dist}.alma.1
-Summary:        Cloud instance init scripts
-License:        Apache-2.0 OR GPL-3.0-only
-URL:            https://github.com/canonical/cloud-init
-
-Source0:        %{url}/archive/%{version}/%{version}.tar.gz
-Source1:        cloud-init-tmpfiles.conf
-Patch1: 0002-downstream-Setting-autoconnect-priority-setting-for-.patch
-Patch2: 0003-downstream-cc_disk_setup-add-sgdisk-to-sfdisk-conver.patch
-Patch3: 0004-downstream-Get-rid-of-gdisk-dependency.patch
-Patch4: 0005-downstream-Revert-chore-eliminate-redundant-ordering.patch
-Patch5: 0006-downstream-remove-single-process-optimization.patch
-Patch6: 0007-fix-don-t-deadlock-when-starting-network-service-wit.patch
-
-# AlmaLinux patches
-Patch1000: 0031-Improvements-for-AlmaLinux-OS-and-CloudLinux-OS.patch
-
-BuildArch:      noarch
-
-BuildRequires:  systemd-rpm-macros
-BuildRequires:  python3-devel
-BuildRequires:  pkgconfig(systemd)
-
-%if %{with tests}
-BuildRequires:  iproute
-BuildRequires:  passwd
-BuildRequires:  procps-ng
-# dnf is needed to make cc_ntp unit tests work
-# https://bugs.launchpad.net/cloud-init/+bug/1721573
-BuildRequires:  /usr/bin/dnf
-BuildRequires:  python3dist(pytest)
-BuildRequires:  python3dist(pytest-mock)
-BuildRequires:  python3dist(responses)
-BuildRequires:  python3dist(passlib)
-%endif
-
-# ISC DHCP is no longer maintained and cloud-init 24.1 now supports
-# dhcpcd. See commit 21b2b6e4423b0fec325 and the upstream PR
-# https://github.com/canonical/cloud-init/pull/4746.
-#
-Requires:       dhcpcd
-
-Requires:       hostname
-Requires:       e2fsprogs
-Requires:       iproute
-Requires:       python3-libselinux
-Requires:       policycoreutils-python3
-Requires:       procps
-Requires:       python3-configobj
-Requires:       python3-jinja2
-Requires:       python3-jsonpatch
-Requires:       python3-oauthlib
-Requires:       python3-pyserial
-Requires:       python3-PyYAML
-Requires:       python3-requests
-Requires:       shadow-utils
-Requires:       util-linux
-Requires:       xfsprogs
-# https://bugzilla.redhat.com/show_bug.cgi?id=1974262
-Requires:       openssl
-
-%{?systemd_requires}
-
-
-%description
-Cloud-init is a set of init scripts for cloud instances.  Cloud instances
-need special scripts to run during initialization to retrieve and install
-ssh keys and to let the user run various scripts.
-
-
-%prep
-%autosetup -p1
-
-# Change shebangs
-sed -i -e 's|#!/usr/bin/env python|#!/usr/bin/env python3|' \
-       -e 's|#!/usr/bin/python|#!/usr/bin/python3|' tools/* cloudinit/ssh_util.py
-
-# Removing shebang manually because of rpmlint, will update upstream later
-sed -i -e 's|#!/usr/bin/python||' cloudinit/cmd/main.py
-
-# Use unittest from the standard library. unittest2 is old and being
-# retired in Fedora. See https://bugzilla.redhat.com/show_bug.cgi?id=1794222
-find tests/ -type f | xargs sed -i s/unittest2/unittest/
-find tests/ -type f | xargs sed -i s/assertItemsEqual/assertCountEqual/
-
-
-%generate_buildrequires
-%pyproject_buildrequires
-
-
-%build
-%py3_build
-
-
-%install
-%py3_install -- --init-system=systemd
-
-# Generate cloud-config file
-python3 tools/render-template --variant %{?rhel:rhel}%{!?rhel:fedora} > $RPM_BUILD_ROOT/%{_sysconfdir}/cloud/cloud.cfg
-
-sed -i "s,@@PACKAGED_VERSION@@,%{version}-%{release}," $RPM_BUILD_ROOT/%{python3_sitelib}/cloudinit/version.py
-
-mkdir -p $RPM_BUILD_ROOT/var/lib/cloud
-
-# /run/cloud-init needs a tmpfiles.d entry
-mkdir -p $RPM_BUILD_ROOT/run/cloud-init
-mkdir -p $RPM_BUILD_ROOT/%{_tmpfilesdir}
-cp -p %{SOURCE1} $RPM_BUILD_ROOT/%{_tmpfilesdir}/%{name}.conf
-
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rsyslog.d
-cp -p tools/21-cloudinit.conf $RPM_BUILD_ROOT/%{_sysconfdir}/rsyslog.d/21-cloudinit.conf
-
-# installing man pages
-mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1/
-for man in cloud-id.1 cloud-init.1 cloud-init-per.1; do
-    install -c -m 0644 doc/man/${man} ${RPM_BUILD_ROOT}%{_mandir}/man1/${man}
-    chmod -x ${RPM_BUILD_ROOT}%{_mandir}/man1/*
-done
-
-
-%check
-%if %{with tests}
-python3 -m pytest tests/unittests
-%else
-%py3_check_import cloudinit
-%endif
-
-%post
-%systemd_post cloud-config.service cloud-config.target cloud-final.service cloud-init.service cloud-init.target cloud-init-local.service
-
-if [ $1 -eq 1 ] ; then
-    # Initial installation
-    # Enabled by default per "runs once then goes away" exception
-    /bin/systemctl enable cloud-config.service     >/dev/null 2>&1 || :
-    /bin/systemctl enable cloud-final.service      >/dev/null 2>&1 || :
-    /bin/systemctl enable cloud-init.service       >/dev/null 2>&1 || :
-    /bin/systemctl enable cloud-init-local.service >/dev/null 2>&1 || :
-    /bin/systemctl enable cloud-init.target        >/dev/null 2>&1 || :
-elif [ $1 -eq 2 ]; then
-    # Upgrade
-    # RHBZ 2210012 - check for null ssh_genkeytypes value in cloud.cfg that
-    # breaks ssh connectivity after upgrade to a newer version of cloud-init.
-    if [ -f  %{_sysconfdir}/cloud/cloud.cfg.rpmnew ] && grep -q '^\s*ssh_genkeytypes:\s*~\s*$'  %{_sysconfdir}/cloud/cloud.cfg ; then
-       echo "***********************************************"
-       echo "*** WARNING!!!! ***"
-       echo ""
-       echo "ssh_genkeytypes set to null in /etc/cloud/cloud.cfg!"
-       echo "SSH access might be broken after reboot. Please check the following KCS"
-       echo "for more detailed information:"
-       echo ""
-       echo "https://access.redhat.com/solutions/6988034"
-       echo ""
-       echo "Please reconcile the differences between /etc/cloud/cloud.cfg and "
-       echo "/etc/cloud/cloud.cfg.rpmnew and update ssh_genkeytypes configuration in "
-       echo "/etc/cloud/cloud.cfg to a list of keytype values, something like:"
-       echo "ssh_genkeytypes:  ['rsa', 'ecdsa', 'ed25519']"
-       echo ""
-       echo "************************************************"
-    fi
-    # If the upgrade is from a version older than 0.7.9-8,
-    # there will be stale systemd config
-    /bin/systemctl is-enabled cloud-config.service >/dev/null 2>&1 &&
-      /bin/systemctl reenable cloud-config.service >/dev/null 2>&1 || :
-fi
-%preun
-%systemd_preun cloud-config.service cloud-config.target cloud-final.service cloud-init.service cloud-init.target cloud-init-local.service
-
-
-%postun
-%systemd_postun cloud-config.service cloud-config.target cloud-final.service cloud-init.service cloud-init.target cloud-init-local.service
-
-if [ $1 -eq 0 ] ; then
-    # warn during package removal not upgrade
-    if [ -f /etc/ssh/sshd_config.d/50-cloud-init.conf ] ; then
-	echo "/etc/ssh/sshd_config.d/50-cloud-init.conf not removed"
-    fi
-
-    if [ -f /etc/NetworkManager/conf.d/99-cloud-init.conf ] ; then
-	echo "/etc/NetworkManager/conf.d/99-cloud-init.conf not removed"
-    fi
-
-    if [ -f /etc/NetworkManager/conf.d/30-cloud-init-ip6-addr-gen-mode.conf ] ; then
-	echo "/etc/NetworkManager/conf.d/30-cloud-init-ip6-addr-gen-mode.conf not removed"
-    fi
-fi
-
-%files
-%license LICENSE LICENSE-Apache2.0 LICENSE-GPLv3
-%doc ChangeLog
-%doc doc/*
-%{_mandir}/man1/*
-%config(noreplace) %{_sysconfdir}/cloud/cloud.cfg
-%dir               %{_sysconfdir}/cloud/cloud.cfg.d
-%config(noreplace) %{_sysconfdir}/cloud/cloud.cfg.d/*.cfg
-%doc               %{_sysconfdir}/cloud/cloud.cfg.d/README
-%dir               %{_sysconfdir}/cloud/templates
-%config(noreplace) %{_sysconfdir}/cloud/templates/*
-%dir               %{_sysconfdir}/rsyslog.d
-%config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf
-%{_udevrulesdir}/66-azure-ephemeral.rules
-%{_unitdir}/cloud-config.service
-%{_unitdir}/cloud-final.service
-%{_unitdir}/cloud-init.service
-%{_unitdir}/cloud-init-local.service
-%{_unitdir}/cloud-config.target
-%{_unitdir}/cloud-init.target
-/usr/lib/systemd/system-generators/cloud-init-generator
-%{_unitdir}/cloud-init-hotplugd.service
-%{_unitdir}/cloud-init-hotplugd.socket
-%{_unitdir}/sshd-keygen@.service.d/disable-sshd-keygen-if-cloud-init-active.conf
-%{_tmpfilesdir}/%{name}.conf
-%{python3_sitelib}/*
-%{_libexecdir}/%{name}
-%{_bindir}/cloud-init*
-%{_bindir}/cloud-id
-%dir %verify(not mode) /run/cloud-init
-%dir /var/lib/cloud
-%{_datadir}/bash-completion/completions/cloud-init
-
-
-%changelog
-* Thu Jan 16 2025 Eduard Abdullin <eabdullin@almalinux.org> - 24.4-1.alma.1
-- 0031-Improvements-for-AlmaLinux-OS-and-CloudLinux-OS.patch
-
-* Mon Jan 06 2025 Miroslav Rezanina <mrezanin@redhat.com> - 24.4-1
-- Rebase to 24.4 [RHEL-66254]
-- Resolves: RHEL-66254
-  ([RHEL-10] Rebase cloud-init to 24.4 version)
-
-* Mon Nov 18 2024 Miroslav Rezanina <mrezanin@redhat.com> - 24.1.4-21
-- ci-Prevent-NM-from-handling-DNS-when-network-interfaces.patch [RHEL-65769]
-- Resolves: RHEL-65769
-  ([RHEL-10] Prevent NM from handling DNS when network interfaces have DNS config)
-
-* Mon Nov 11 2024 Miroslav Rezanina <mrezanin@redhat.com> - 24.1.4-20
-- ci-Remove-python3-jsonschema-dependency.patch [RHEL-65849]
-- Resolves: RHEL-65849
-  ([RHEL-10] Drop cloud-init dependency on python-jsonschema)
-
-* Tue Nov 05 2024 Miroslav Rezanina <mrezanin@redhat.com> - 24.1.4-19
-- ci-Fix-metric-setting-for-ifcfg-network-connections-for.patch [RHEL-65016]
-- ci-fix-Render-bridges-correctly-for-v2-on-sysconfig-wit.patch [RHEL-65019]
-- ci-fix-Render-v2-bridges-correctly-on-network-manager-w.patch [RHEL-65019]
-- Resolves: RHEL-65016
-  (Configuring metric for default gateway is not working [rhel-10])
-- Resolves: RHEL-65019
-  (NoCloud - network_config bridges incorrectly configured [rhel-10])
-
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 24.1.4-18
-- Bump release for October 2024 mass rebuild:
-  Resolves: RHEL-64018
-
-* Mon Aug 26 2024 Miroslav Rezanina <mrezanin@redhat.com> - 24.1.4-17
-- ci-fix-Add-subnet-ipv4-ipv6-to-network-schema-5191.patch [RHEL-54688]
-- Resolves: RHEL-54688
-  ([RHEL 10.0] cloud-init schema validation fails.)
-
-* Mon Aug 19 2024 Miroslav Rezanina <mrezanin@redhat.com> - 24.1.4-16
-- ci-Revert-fix-vmware-Set-IPv6-to-dhcp-when-there-is-no-.patch [RHEL-54372]
-- Resolves: RHEL-54372
-  ([RHEL10]Revert "fix(vmware): Set IPv6 to dhcp when there is no IPv6 addr (#5471)")
-
-* Mon Aug 12 2024 Miroslav Rezanina <mrezanin@redhat.com> - 24.1.4-15
-- ci-cc_disk_setup-add-sgdisk-to-sfdisk-convertion-dictio.patch [RHEL-36093]
-- ci-Get-rid-of-gdisk-dependency.patch [RHEL-36093]
-- Resolves: RHEL-36093
-  (Remove cloud-init dependency on obsolete gdisk)
-
-* Wed Jul 24 2024 Miroslav Rezanina <mrezanin@redhat.com> - 24.1.4-14
-- ci-fix-Clean-cache-if-no-datasource-fallback-5499.patch [RHEL-49740]
-- ci-Support-setting-mirrorlist-in-yum-repository-config-.patch [RHEL-49739]
-- Resolves: RHEL-49740
-  ([Cloud-init] [RHEL-10] Password reset feature broken with CloudstackDataSource)
-- Resolves: RHEL-49739
-  (Support setting mirrorlist in yum repository config [rhel-10])
-
-* Fri Jul 12 2024 Miroslav Rezanina <mrezanin@redhat.com> - 24.1.4-13
-- ci-fix-add-schema-rules-for-baseurl-and-metalink-in-yum.patch [RHEL-46874]
-- Resolves: RHEL-46874
-  (Suggest to update schema to support metalink [rhel-10])
-
-* Mon Jul 08 2024 Miroslav Rezanina <mrezanin@redhat.com> - 24.1.4-12
-- ci-Support-metalink-in-yum-repository-config-5444.patch [RHEL-44918]
-- ci-fix-vmware-Set-IPv6-to-dhcp-when-there-is-no-IPv6-ad.patch [RHEL-35562]
-- Resolves: RHEL-44918
-  ([RFE] Support metalink in yum repository config [rhel-10])
-- Resolves: RHEL-35562
-  ([RHEL-10] It leaves the ipv6 networking config as blank in NM keyfile when config dhcp ipv6 with customization spec)
-
-* Mon Jul 01 2024 Miroslav Rezanina <mrezanin@redhat.com> - 24.1.4-11
-- ci-Deprecate-the-users-ssh-authorized-keys-property-516.patch [RHEL-45263]
-- ci-docs-Add-deprecated-system_info-to-schema-5168.patch [RHEL-45263]
-- ci-fix-schema-permit-deprecated-hyphenated-keys-under-u.patch [RHEL-45263]
-- Resolves: RHEL-45263
-  (Deprecate the users ssh-authorized-keys property and permit deprecated hyphenated keys under users key [rhel-10])
-
-* Wed Jun 26 2024 Miroslav Rezanina <mrezanin@redhat.com> - 24.1.4-10
-- ci-feat-sysconfig-Add-DNS-from-interface-config-to-reso.patch [RHEL-44334]
-- ci-fix-jsonschema-Add-missing-sudo-definition-5418.patch [RHEL-44338]
-- ci-doc-update-examples-to-reflect-alternative-ways-to-p.patch [RHEL-44338]
-- ci-Update-pylint-version-to-support-python-3.12-5338.patch [RHEL-44599]
-- Resolves: RHEL-44334
-  ([RHEL-10] cloud-init fails to configure DNS search domains)
-- Resolves: RHEL-44338
-  ([RHEL-10] fix `SUDO` configuration schema for users and groups)
-- Resolves: RHEL-44599
-  ([rhel-10] fix pylint error and support python 3.12)
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 24.1.4-9
-- Bump release for June 2024 mass rebuild
-
-* Thu Jun 20 2024 Miroslav Rezanina <mrezanin@redhat.com> - 24.1.4-8
-- ci-.distro-spec-add-missing-dependencies-for-cloud-init.patch [RHEL-41010]
-- Resolves: RHEL-41010
-  ([RHEL-10] Add missing Requires dependency in cloud-init)
-
-* Wed Jun 12 2024 Miroslav Rezanina <mrezanin@redhat.com> - 24.1.4-7
-- ci-Add-back-dependency-on-python3-configobj.patch [RHEL-39347]
-- Resolves: RHEL-39347
-  ([RHEL-10] Requires dependency python3-configobj)
-
-* Tue Jun 04 2024 Miroslav Rezanina <mrezanin@redhat.com> - 24.1.4-6
-- ci-.distro-spec-remove-dependency-on-net-tools.patch [RHEL-39345]
-- Resolves: RHEL-39345
-  ([RHEL-10] Remove dependency on net-tools)
-
-* Mon May 27 2024 Miroslav Rezanina <mrezanin@redhat.com> - 24.1.4-5
-- ci-feat-Set-RH-ssh-key-permissions-when-no-ssh_keys-gro.patch [RHEL-36456]
-- Resolves: RHEL-36456
-  ([RHEL-10] Group ssh_keys is missing and ssh host key permission is changed in rhel-10)
-
-* Mon May 06 2024 Miroslav Rezanina <mrezanin@redhat.com> - 24.1.4-4
-- ci-Report-full-specific-version-with-cloud-init-version.patch [RHEL-34764]
-- Resolves: RHEL-34764
-  ([RHEL-10] cloud-init should report full version with "cloud-init --version" )
-
-* Mon Apr 29 2024 Miroslav Rezanina <mrezanin@redhat.com> - 24.1.4-3
-- ci-Fix-spec-file-post-install-script.patch [RHEL-33954]
-- ci-refactor-remove-dependency-on-netifaces-4634.patch [RHEL-34518]
-- ci-DS-VMware-Fix-ipv6-addr-converter-from-netinfo-to-ne.patch [RHEL-34518]
-- Resolves: RHEL-33954
-  ([RHEL-10] There is error message during cloud-init installation)
-- Resolves: RHEL-34518
-  (Remove dependency to netifcaces)
-
-* Tue Apr 23 2024 Miroslav Rezanina <mrezanin@redhat.com> - 24.1.4-2
-- ci-Remove-dependency-on-dhcp-client-ISC-DHCP-and-use-dh.patch [RHEL-26304]
-- ci-fix-Fall-back-to-cached-local-ds-if-no-valid-ds-foun.patch [RHEL-32854]
-- Resolves: RHEL-26304
-  ([RFE][rhel-10] Suggest to remove dependency on dhcp-client in cloud-init)
-- Resolves: RHEL-32854
-  ([cloud-init][ESXi]VMware datasource resets on every boot causing it to lose network configuration [rhel-10.0])
-
-* Mon Apr 22 2024 Miroslav Rezanina <mrezanin@redhat.com> - 24.1.4-1
-- Rebase to 24.1.4 [RHEL-33439]
-- Resolves: RHEL-33439
-  (Update cloud-init on 24.1.4 for RHEL 10)
-
-* Thu Feb 01 2024 Major Hayden <major@redhat.com> - 23.4.1-5
-- Switch back to dhcp-client temporarily
-
-* Tue Jan 30 2024 Major Hayden <major@redhat.com> - 23.4.1-4
-- Replace dhcp-client with udhcpc
-
-* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 23.4.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 23.4.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Dec 22 2023 František Zatloukal <fzatlouk@redhat.com> - 23.4.1-1
-- Update to 23.4.1
-
-* Fri Aug 11 2023 Miroslav Suchý <msuchy@redhat.com> - 23.2.1-2
-- correct SPDX formula
-
-* Thu Jul 20 2023 Major Hayden <major@redhat.com> - 23.2.1-1
-- Update to 23.2.1
-
-* Thu Jul 20 2023 Major Hayden <major@redhat.com> - 23.2-4
-- Add packit config
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 23.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Jun 29 2023 Python Maint <python-maint@redhat.com> - 23.2-2
-- Rebuilt for Python 3.12
-
-* Thu Jun 22 2023 Major Hayden <major@redhat.com> - 23.2-1
-- Update to 23.2 rhbz#2196523
-
-* Wed May 17 2023 Major Hayden <major@redhat.com> - 23.1.2-10
-- Migrate to pyproject-rpm-macros for build requirements
-
-* Tue May 16 2023 Major Hayden <major@redhat.com> - 23.1.2-9
-- ec2: Do not enable DHCPv6 on EC2
-
-* Tue May 16 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 23.1.2-8
-- Disable tests by default in RHEL builds
-
-* Thu May 11 2023 Major Hayden <major@redhat.com> - 23.1.2-7
-- Update changelog for rhbz#2068529
-
-* Thu May 11 2023 Major Hayden <major@redhat.com> - 23.1.2-6
-- Allow > 3 nameservers to be used rhbz#2068529
-
-* Sun Apr 30 2023 Neal Gompa <ngompa@fedoraproject.org> - 23.1.2-5
-- Use the correct SourceURL format for the upstream sources
-- Switch to SPDX identifiers for the license field
-
-* Fri Apr 28 2023 Major Hayden <major@redhat.com> - 23.1.2-4
-- Switch to GitHub for upstream source
-
-* Fri Apr 28 2023 Major Hayden <major@redhat.com> - 23.1.2-3
-- Revert "Use forge source"
-
-* Fri Apr 28 2023 Major Hayden <major@redhat.com> - 23.1.2-2
-- Use forge source
-
-* Thu Apr 27 2023 Major Hayden <major@redhat.com> - 23.1.2-1
-- Update to 23.1.2
-
-* Thu Mar 23 2023 František Zatloukal <fzatlouk@redhat.com> - 23.1.1-1
-- Rebase to 23.1.1
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 22.2-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 22.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Jun 16 2022 Python Maint <python-maint@redhat.com> - 22.2-3
-- Rebuilt for Python 3.11
-
-* Thu Jun 16 2022 Neal Gompa <ngompa@fedoraproject.org> - 22.2-2
-- Add dhcp-client dependency for Azure and OCI network bootstrap
-
-* Thu May 19 2022 Neal Gompa <ngompa@fedoraproject.org> - 22.2-1
-- Rebase to 22.2
-
-* Thu Mar 10 2022 Dusty Mabe <dusty@dustymabe.com> - 22.1-3
-- Don't require NetworkManager-config-server
-
-* Tue Feb 22 2022 Neal Gompa <ngompa@fedoraproject.org> - 22.1-2
-- Drop extra tests search in prep
-
-* Tue Feb 22 2022 Neal Gompa <ngompa@fedoraproject.org> - 22.1-1
-- Rebase to 22.1
-- Backport cloud-init PR to add proper NetworkManager support
-- Add patch to prefer NetworkManager
-
-* Wed Feb 16 2022 Charalampos Stratakis <cstratak@redhat.com> - 21.3-6
-- Remove redundant dependencies on nose and mock

gating.yaml

@@ -1,9 +0,0 @@
---- !Policy
-product_versions:
-    - rhel-10
-decision_context: osci_compose_gate
-rules:
-    - !PassingTestCaseRule {test_case_name: 3rd-azure-ci.brew-build.tier1.functional}
-    - !PassingTestCaseRule {test_case_name: 3rd-esxi-x86_64.brew-build.tier1.functional}
-    - !PassingTestCaseRule {test_case_name: s1-aws-ci.brew-build.tier1.functional}
-    - !PassingTestCaseRule {test_case_name: 3rd-openstack-cloudinit-ci.brew-build.tier1.functional}

sources

@@ -1 +0,0 @@
-SHA512 (24.4.tar.gz) = df42fb0c97aba37599e3c9431e1dfffc0a3c0ce6d639fd9a980fe0da190c998da3130ab65e3288eecd193967dbaad41aac3c0040244cf6036db9584a3c87538d