SOURCES/0001-Add-initial-redhat-changes.patch

@@ -0,0 +1,99 @@
+From 03345a88b8b0008a4a81e010d46290f5ba643ebc Mon Sep 17 00:00:00 2001
+From: Ani Sinha <anisinha@redhat.com>
+Date: Wed, 13 Dec 2023 11:54:55 +0530
+Subject: [PATCH] Add initial redhat changes
+
+Adding minimal set of changes necessary for successful build of the package
+on RHEL/CentOS 9 Stream koji.
+
+Additional changes on top of the changes in 23.1.1 rebase:
+ - Updated VERSION, TARSHA512, MARKER and BUILD_TARGET_RHEL parameters in
+   Makefile.common in .dist/
+ - Squashed unit test fixes for the downstream changes in cloudinit/settings.py.
+
+Changes from 23.1.1 rebase follows:
+
+Merged patches (23.1.1):
+724a80ac  Add TargetRelease
+967a4405b rhel/cloud.cfg: remove ssh_genkeytypes in settings.py and set in cloud.cfg
+^ Merged since it removes hunks added in this commit itself
+
+Discarded because not needed anymore (packit):
+e3fd7ce12 Configure Packit to ignore the .gitignore file
+e18654e9  Fixes for packit support
+
+Discarded because file does not exist anymore and templates are aligned with upstream:
+3576b12460bf18557857ee25df6bf530dab66612 Adding _netdev to the default mount configuration
+8092b57ab245856ff1fdde1469960608a489c95e   Remove rhel specific files
+
+Added the following entry to %files to keep track of the new README file in config/clean.d/README
+%doc               %{_sysconfdir}/cloud/clean.d/README
+
+ignored
+c75e509b0 Revert "Revert "Setting highest autoconnect priority for network-scripts""
+0eba5c619 Revert "Setting highest autoconnect priority for network-scripts"
+
+ignored
+ba19343c0d9807d0c68a2d8e4ab274f3ca884247 Add Gitlab CI
+fe09305a5479a4814d6c46df07a906bafa29d637 Delete .gitlab-ci.yml
+
+Conflicts:
+missing rhel/ static files and "" instead of '' in setup.py
+
+X-downstram-only: true
+Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+---
+ cloudinit/settings.py            |  5 +++--
+ tests/unittests/cmd/test_main.py | 15 +++++++++------
+ 2 files changed, 12 insertions(+), 8 deletions(-)
+
+diff --git a/cloudinit/settings.py b/cloudinit/settings.py
+index 592e144d..5ced21bd 100644
+--- a/cloudinit/settings.py
++++ b/cloudinit/settings.py
+@@ -54,13 +54,14 @@ CFG_BUILTIN = {
+     ],
+     "def_log_file": "/var/log/cloud-init.log",
+     "log_cfgs": [],
+-    "syslog_fix_perms": ["syslog:adm", "root:adm", "root:wheel", "root:root"],
++    "mount_default_fields": [None, None, "auto", "defaults,nofail", "0", "2"],
++    "syslog_fix_perms": [],
+     "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..19d26ebe 100644
+--- a/tests/unittests/cmd/test_main.py
++++ b/tests/unittests/cmd/test_main.py
+@@ -119,14 +119,17 @@ 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": [],
++                    "mount_default_fields": [
++                        None,
++                        None,
++                        "auto",
++                        "defaults,nofail",
++                        "0",
++                        "2",
++                    ],
+                 }
+             )
+             updated_cfg.pop("system_info")

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

@@ -1,32 +1,31 @@
-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
+From 5129908caa1867c7f584ec8d38607cf56b20521a Mon Sep 17 00:00:00 2001
+From: Eduardo Otubo <otubo@redhat.com>
+Date: Fri, 7 May 2021 13:36:06 +0200
+Subject: [PATCH] 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")
+Conflicts 20.3:
+ - Not appplying patch on cloudinit/net/sysconfig.py since it now has a
+mechanism to identify if cloud-init is running on RHEL, having the
+correct settings for NM_CONTROLLED.
 
+Merged patches (21.1):
+- ecbace48 sysconfig: Don't write BOOTPROTO=dhcp for ipv6 dhcp
+- a1a00383 include 'NOZEROCONF=yes' in /etc/sysconfig/network
 X-downstream-only: true
+Signed-off-by: Eduardo Otubo <otubo@redhat.com>
+Signed-off-by: Ryan McCabe <rmccabe@redhat.com>
 
-Signed-off-by: Cathy Avery <cavery@redhat.com>
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
 ---
- cloudinit/net/sysconfig.py                    |  1 -
+ cloudinit/net/sysconfig.py                    | 12 ++++-
  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(-)
+ 4 files changed, 10 insertions(+), 64 deletions(-)
 
 diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
-index 7570a5e3..3b7a1f93 100644
+index 7570a5e3..f01c4236 100644
 --- a/cloudinit/net/sysconfig.py
 +++ b/cloudinit/net/sysconfig.py
 @@ -317,7 +317,6 @@ class Renderer(renderer.Renderer):
@@ -37,6 +36,24 @@ index 7570a5e3..3b7a1f93 100644
              "BOOTPROTO": "none",
          },
          "suse": {"BOOTPROTO": "static", "STARTMODE": "auto"},
+@@ -1030,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")
 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
@@ -545,6 +562,3 @@ index c5509536..052b0674 100644
                  ONBOOT=yes
                  TYPE=Ethernet
                  USERCTL=no
--- 
-2.41.0
-

SOURCES/0003-Setting-autoconnect-priority-setting-for-network-scr.patch

@@ -0,0 +1,582 @@
+From 8a2fcbbcfdfc1df6f6c18f96588154f40083a239 Mon Sep 17 00:00:00 2001
+From: Ani Sinha <anisinha@redhat.com>
+Date: Wed, 13 Dec 2023 11:55:16 +0530
+Subject: [PATCH] Setting autoconnect priority setting for network-scripts
+
+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>
+---
+ 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 insertions(+)
+
+diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
+index f01c4236..d39f4fe3 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 7b9121b2..288e3e37 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 962ff7fb..4c624079 100644
+--- a/tests/unittests/distros/test_netconfig.py
++++ b/tests/unittests/distros/test_netconfig.py
+@@ -717,6 +717,7 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
+         expected_cfgs = {
+             self.ifcfg_path("eth0"): dedent(
+                 """\
++                AUTOCONNECT_PRIORITY=120
+                 BOOTPROTO=none
+                 DEFROUTE=yes
+                 DEVICE=eth0
+@@ -730,6 +731,7 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
+             ),
+             self.ifcfg_path("eth1"): dedent(
+                 """\
++                AUTOCONNECT_PRIORITY=120
+                 BOOTPROTO=dhcp
+                 DEVICE=eth1
+                 ONBOOT=yes
+@@ -754,6 +756,7 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
+         expected_cfgs = {
+             self.ifcfg_path("eth0"): dedent(
+                 """\
++                AUTOCONNECT_PRIORITY=120
+                 BOOTPROTO=none
+                 DEFROUTE=yes
+                 DEVICE=eth0
+@@ -769,6 +772,7 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
+             ),
+             self.ifcfg_path("eth1"): dedent(
+                 """\
++                AUTOCONNECT_PRIORITY=120
+                 BOOTPROTO=dhcp
+                 DEVICE=eth1
+                 ONBOOT=yes
+@@ -812,6 +816,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
+@@ -824,6 +829,7 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
+             ),
+             self.ifcfg_path("infra0"): dedent(
+                 """\
++                AUTOCONNECT_PRIORITY=120
+                 BOOTPROTO=none
+                 DEVICE=infra0
+                 IPADDR=10.0.1.2
+@@ -859,6 +865,7 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
+         expected_cfgs = {
+             self.ifcfg_path("eth0"): dedent(
+                 """\
++                AUTOCONNECT_PRIORITY=120
+                 BOOTPROTO=none
+                 DEVICE=eth0
+                 IPADDR=192.10.1.2
+@@ -870,6 +877,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/test_net.py b/tests/unittests/test_net.py
+index 052b0674..cef4fa2d 100644
+--- a/tests/unittests/test_net.py
++++ b/tests/unittests/test_net.py
+@@ -578,6 +578,7 @@ dns = none
+                 """
+ # Created by cloud-init automatically, do not edit.
+ #
++AUTOCONNECT_PRIORITY=120
+ BOOTPROTO=none
+ DEFROUTE=yes
+ DEVICE=eth0
+@@ -740,6 +741,7 @@ dns = none
+                 """
+ # Created by cloud-init automatically, do not edit.
+ #
++AUTOCONNECT_PRIORITY=120
+ BOOTPROTO=none
+ DEFROUTE=yes
+ DEVICE=eth0
+@@ -897,6 +899,7 @@ dns = none
+                 """
+ # Created by cloud-init automatically, do not edit.
+ #
++AUTOCONNECT_PRIORITY=120
+ BOOTPROTO=none
+ DEFROUTE=yes
+ DEVICE=eth0
+@@ -1137,6 +1140,7 @@ NETWORK_CONFIGS = {
+         "expected_sysconfig_rhel": {
+             "ifcfg-eth1": textwrap.dedent(
+                 """\
++                AUTOCONNECT_PRIORITY=120
+                 BOOTPROTO=none
+                 DEVICE=eth1
+                 HWADDR=cf:d6:af:48:e8:80
+@@ -1146,6 +1150,7 @@ NETWORK_CONFIGS = {
+             ),
+             "ifcfg-eth99": textwrap.dedent(
+                 """\
++                AUTOCONNECT_PRIORITY=120
+                 BOOTPROTO=dhcp
+                 DEFROUTE=yes
+                 DEVICE=eth99
+@@ -1311,6 +1316,7 @@ NETWORK_CONFIGS = {
+         "expected_sysconfig_rhel": {
+             "ifcfg-eth1": textwrap.dedent(
+                 """\
++                AUTOCONNECT_PRIORITY=120
+                 BOOTPROTO=none
+                 DEVICE=eth1
+                 HWADDR=cf:d6:af:48:e8:80
+@@ -1320,6 +1326,7 @@ NETWORK_CONFIGS = {
+             ),
+             "ifcfg-eth99": textwrap.dedent(
+                 """\
++                AUTOCONNECT_PRIORITY=120
+                 BOOTPROTO=dhcp
+                 DEFROUTE=yes
+                 DEVICE=eth99
+@@ -1566,6 +1573,7 @@ NETWORK_CONFIGS = {
+         "expected_sysconfig_rhel": {
+             "ifcfg-iface0": textwrap.dedent(
+                 """\
++                AUTOCONNECT_PRIORITY=120
+                 BOOTPROTO=none
+                 DEVICE=iface0
+                 IPADDR=192.168.14.2
+@@ -1712,6 +1720,7 @@ NETWORK_CONFIGS = {
+         "expected_sysconfig_rhel": {
+             "ifcfg-iface0": textwrap.dedent(
+                 """\
++                AUTOCONNECT_PRIORITY=120
+                 BOOTPROTO=none
+                 DEVICE=iface0
+                 DHCPV6C=yes
+@@ -1801,6 +1810,7 @@ NETWORK_CONFIGS = {
+         "expected_sysconfig_rhel": {
+             "ifcfg-iface0": textwrap.dedent(
+                 """\
++                AUTOCONNECT_PRIORITY=120
+                 BOOTPROTO=none
+                 DEVICE=iface0
+                 DHCPV6C=yes
+@@ -1876,6 +1886,7 @@ NETWORK_CONFIGS = {
+         "expected_sysconfig_rhel": {
+             "ifcfg-iface0": textwrap.dedent(
+                 """\
++                AUTOCONNECT_PRIORITY=120
+                 BOOTPROTO=none
+                 DEVICE=iface0
+                 DHCPV6C=yes
+@@ -1940,6 +1951,7 @@ NETWORK_CONFIGS = {
+         "expected_sysconfig_rhel": {
+             "ifcfg-iface0": textwrap.dedent(
+                 """\
++                AUTOCONNECT_PRIORITY=120
+                 BOOTPROTO=none
+                 DEVICE=iface0
+                 IPV6_AUTOCONF=yes
+@@ -1995,6 +2007,7 @@ NETWORK_CONFIGS = {
+         "expected_sysconfig_rhel": {
+             "ifcfg-iface0": textwrap.dedent(
+                 """\
++            AUTOCONNECT_PRIORITY=120
+             BOOTPROTO=none
+             DEVICE=iface0
+             IPV6ADDR=2001:1::1/64
+@@ -2051,6 +2064,7 @@ NETWORK_CONFIGS = {
+         "expected_sysconfig_rhel": {
+             "ifcfg-iface0": textwrap.dedent(
+                 """\
++            AUTOCONNECT_PRIORITY=120
+             BOOTPROTO=none
+             DEVICE=iface0
+             DHCPV6C=yes
+@@ -2135,6 +2149,7 @@ NETWORK_CONFIGS = {
+         "expected_sysconfig_rhel": {
+             "ifcfg-iface0": textwrap.dedent(
+                 """\
++            AUTOCONNECT_PRIORITY=120
+             BOOTPROTO=none
+             DEVICE=iface0
+             DHCPV6C=yes
+@@ -2181,6 +2196,7 @@ NETWORK_CONFIGS = {
+         "expected_sysconfig_rhel": {
+             "ifcfg-iface0": textwrap.dedent(
+                 """\
++                AUTOCONNECT_PRIORITY=120
+                 BOOTPROTO=dhcp
+                 DEVICE=iface0
+                 ONBOOT=yes
+@@ -2256,6 +2272,7 @@ NETWORK_CONFIGS = {
+         "expected_sysconfig_rhel": {
+             "ifcfg-iface0": textwrap.dedent(
+                 """\
++                AUTOCONNECT_PRIORITY=120
+                 BOOTPROTO=dhcp
+                 DEVICE=iface0
+                 ETHTOOL_OPTS="wol g"
+@@ -2591,6 +2608,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 """
+@@ -2608,6 +2626,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
+@@ -2619,6 +2638,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
+@@ -2638,6 +2658,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
+@@ -2647,6 +2668,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
+@@ -2666,6 +2688,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
+@@ -2677,6 +2700,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
+@@ -2688,6 +2712,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
+@@ -2698,6 +2723,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
+@@ -2708,6 +2734,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
+@@ -2718,6 +2745,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
+@@ -3422,6 +3450,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 """
+@@ -3452,6 +3481,7 @@ iface bond0 inet6 static
+             ),
+             "ifcfg-bond0s0": textwrap.dedent(
+                 """\
++        AUTOCONNECT_PRIORITY=120
+         BOOTPROTO=none
+         DEVICE=bond0s0
+         HWADDR=aa:bb:cc:dd:e8:00
+@@ -3479,6 +3509,7 @@ iface bond0 inet6 static
+             ),
+             "ifcfg-bond0s1": textwrap.dedent(
+                 """\
++        AUTOCONNECT_PRIORITY=120
+         BOOTPROTO=none
+         DEVICE=bond0s1
+         HWADDR=aa:bb:cc:dd:e8:01
+@@ -3628,6 +3659,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
+@@ -3637,6 +3669,7 @@ iface bond0 inet6 static
+             ),
+             "ifcfg-en0.99": textwrap.dedent(
+                 """\
++                AUTOCONNECT_PRIORITY=120
+                 BOOTPROTO=none
+                 DEFROUTE=yes
+                 DEVICE=en0.99
+@@ -3774,6 +3807,7 @@ iface bond0 inet6 static
+         "expected_sysconfig_rhel": {
+             "ifcfg-br0": textwrap.dedent(
+                 """\
++                AUTOCONNECT_PRIORITY=120
+                 BOOTPROTO=none
+                 DEVICE=br0
+                 IPADDR=192.168.2.2
+@@ -3787,6 +3821,7 @@ iface bond0 inet6 static
+             ),
+             "ifcfg-eth0": textwrap.dedent(
+                 """\
++                AUTOCONNECT_PRIORITY=120
+                 BOOTPROTO=none
+                 BRIDGE=br0
+                 DEVICE=eth0
+@@ -3802,6 +3837,7 @@ iface bond0 inet6 static
+             ),
+             "ifcfg-eth1": textwrap.dedent(
+                 """\
++                AUTOCONNECT_PRIORITY=120
+                 BOOTPROTO=none
+                 BRIDGE=br0
+                 DEVICE=eth1
+@@ -3989,6 +4025,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
+@@ -4001,6 +4038,7 @@ iface bond0 inet6 static
+             ),
+             "ifcfg-eth1": textwrap.dedent(
+                 """\
++                AUTOCONNECT_PRIORITY=120
+                 BOOTPROTO=none
+                 DEVICE=eth1
+                 HWADDR=52:54:00:12:34:aa
+@@ -4012,6 +4050,7 @@ iface bond0 inet6 static
+             ),
+             "ifcfg-eth2": textwrap.dedent(
+                 """\
++                AUTOCONNECT_PRIORITY=120
+                 BOOTPROTO=none
+                 DEVICE=eth2
+                 HWADDR=52:54:00:12:34:ff
+@@ -4096,6 +4135,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
+@@ -4693,6 +4733,7 @@ class TestRhelSysConfigRendering(CiTestCase):
+             expected_content = """
+ # Created by cloud-init automatically, do not edit.
+ #
++AUTOCONNECT_PRIORITY=120
+ BOOTPROTO=dhcp
+ DEVICE=eth1000
+ HWADDR=07-1c-c6-75-a4-be
+@@ -4900,6 +4941,7 @@ USERCTL=no
+         expected = """\
+ # Created by cloud-init automatically, do not edit.
+ #
++AUTOCONNECT_PRIORITY=120
+ BOOTPROTO=none
+ DEFROUTE=yes
+ DEVICE=interface0
+@@ -4929,6 +4971,7 @@ USERCTL=no
+         expected_i1 = """\
+ # Created by cloud-init automatically, do not edit.
+ #
++AUTOCONNECT_PRIORITY=120
+ BOOTPROTO=none
+ DEFROUTE=yes
+ DEVICE=eth0
+@@ -4945,6 +4988,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
+@@ -4972,6 +5016,7 @@ USERCTL=no
+         expected = """\
+ # Created by cloud-init automatically, do not edit.
+ #
++AUTOCONNECT_PRIORITY=120
+ BOOTPROTO=dhcp
+ DEVICE=eth0
+ ONBOOT=yes
+@@ -5191,6 +5236,7 @@ USERCTL=no
+             "expected_sysconfig": {
+                 "ifcfg-ens3": textwrap.dedent(
+                     """\
++                   AUTOCONNECT_PRIORITY=120
+                    BOOTPROTO=none
+                    DEFROUTE=yes
+                    DEVICE=ens3
+@@ -5235,6 +5281,7 @@ USERCTL=no
+         expected = {
+             "ifcfg-eno1": textwrap.dedent(
+                 """\
++                AUTOCONNECT_PRIORITY=120
+                 BOOTPROTO=none
+                 DEVICE=eno1
+                 ONBOOT=yes
+@@ -5244,6 +5291,7 @@ USERCTL=no
+             ),
+             "ifcfg-eno1.1000": textwrap.dedent(
+                 """\
++                AUTOCONNECT_PRIORITY=120
+                 BOOTPROTO=none
+                 DEVICE=eno1.1000
+                 IPADDR=192.6.1.9
+@@ -5276,6 +5324,7 @@ USERCTL=no
+         expected = {
+             "ifcfg-bond0": textwrap.dedent(
+                 """\
++                AUTOCONNECT_PRIORITY=120
+                 BONDING_MASTER=yes
+                 BONDING_SLAVE0=enp0s0
+                 BONDING_SLAVE1=enp0s1
+@@ -5291,6 +5340,7 @@ USERCTL=no
+             ),
+             "ifcfg-enp0s0": textwrap.dedent(
+                 """\
++                AUTOCONNECT_PRIORITY=120
+                 BONDING_MASTER=yes
+                 BOOTPROTO=none
+                 DEVICE=enp0s0
+@@ -5303,6 +5353,7 @@ USERCTL=no
+             ),
+             "ifcfg-enp0s1": textwrap.dedent(
+                 """\
++                AUTOCONNECT_PRIORITY=120
+                 BONDING_MASTER=yes
+                 BOOTPROTO=none
+                 DEVICE=enp0s1
+@@ -5333,6 +5384,7 @@ USERCTL=no
+         expected = {
+             "ifcfg-eno1": textwrap.dedent(
+                 """\
++                AUTOCONNECT_PRIORITY=120
+                 BOOTPROTO=dhcp
+                 DEVICE=eno1
+                 HWADDR=07-1c-c6-75-a4-be
+@@ -5411,6 +5463,7 @@ USERCTL=no
+                 """\
+                 # Created by cloud-init automatically, do not edit.
+                 #
++                AUTOCONNECT_PRIORITY=120
+                 BOOTPROTO=none
+                 DEFROUTE=yes
+                 DEVICE=eth0

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

@@ -1,53 +0,0 @@
-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/0004-net-network_manager-do-not-set-may-fail-to-False-for.patch

@@ -1,15 +1,8 @@
-From 010cd58942c82e902bc02cb5a34074f6083fc890 Mon Sep 17 00:00:00 2001
+From 5fa8113a9efaa90f293b95477c4fa44e3d4b6537 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
+Subject: [PATCH] net/network_manager: do not set "may-fail" to False for both
+ ipv4 and ipv6 dhcp
 
 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
@@ -114,10 +107,10 @@ index 8374cfcc..8a99eb3a 100644
              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
+index cef4fa2d..fb4c863c 100644
 --- a/tests/unittests/test_net.py
 +++ b/tests/unittests/test_net.py
-@@ -1470,11 +1470,11 @@ NETWORK_CONFIGS = {
+@@ -1477,11 +1477,11 @@ NETWORK_CONFIGS = {
  
                  [ipv4]
                  method=auto
@@ -131,7 +124,7 @@ index 052b0674..54d053f3 100644
  
                  """
              ),
-@@ -1642,11 +1642,11 @@ NETWORK_CONFIGS = {
+@@ -1650,11 +1650,11 @@ NETWORK_CONFIGS = {
  
                  [ipv6]
                  method=auto
@@ -145,6 +138,3 @@ index 052b0674..54d053f3 100644
  
                  """
              ),
--- 
-2.41.0
-

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

@@ -1,16 +1,9 @@
-From 2942fb776cd1fc765089ebd0004e01dc2b3a5920 Mon Sep 17 00:00:00 2001
+From 54e87eaad7841270e530beff2dcfe68292ae87ef 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
+Subject: [PATCH] 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.
@@ -86,10 +79,10 @@ index 561d5151..60a44186 100644
                      "set-name": "ens3",
                  }
 diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
-index 54d053f3..e52c2497 100644
+index fb4c863c..d9ef493b 100644
 --- a/tests/unittests/test_net.py
 +++ b/tests/unittests/test_net.py
-@@ -4299,6 +4299,7 @@ class TestGenerateFallbackConfig(CiTestCase):
+@@ -4339,6 +4339,7 @@ class TestGenerateFallbackConfig(CiTestCase):
              "ethernets": {
                  "eth0": {
                      "dhcp4": True,
@@ -97,7 +90,7 @@ index 54d053f3..e52c2497 100644
                      "set-name": "eth0",
                      "match": {
                          "macaddress": "00:11:22:33:44:55",
-@@ -4383,6 +4384,9 @@ iface lo inet loopback
+@@ -4423,6 +4424,9 @@ iface lo inet loopback
  
  auto eth0
  iface eth0 inet dhcp
@@ -107,7 +100,7 @@ index 54d053f3..e52c2497 100644
  """
          self.assertEqual(expected.lstrip(), contents.lstrip())
  
-@@ -4472,6 +4476,9 @@ iface lo inet loopback
+@@ -4512,6 +4516,9 @@ iface lo inet loopback
  
  auto eth1
  iface eth1 inet dhcp
@@ -117,8 +110,8 @@ index 54d053f3..e52c2497 100644
  """
          self.assertEqual(expected.lstrip(), contents.lstrip())
  
-@@ -4695,7 +4702,9 @@ class TestRhelSysConfigRendering(CiTestCase):
- #
+@@ -4736,7 +4743,9 @@ class TestRhelSysConfigRendering(CiTestCase):
+ AUTOCONNECT_PRIORITY=120
  BOOTPROTO=dhcp
  DEVICE=eth1000
 +DHCPV6C=yes
@@ -127,7 +120,7 @@ index 54d053f3..e52c2497 100644
  ONBOOT=yes
  TYPE=Ethernet
  USERCTL=no
-@@ -5593,7 +5602,8 @@ class TestOpenSuseSysConfigRendering(CiTestCase):
+@@ -5646,7 +5655,8 @@ class TestOpenSuseSysConfigRendering(CiTestCase):
              expected_content = """
  # Created by cloud-init automatically, do not edit.
  #
@@ -137,7 +130,7 @@ index 54d053f3..e52c2497 100644
  LLADDR=07-1c-c6-75-a4-be
  STARTMODE=auto
  """.lstrip()
-@@ -5979,7 +5989,11 @@ class TestNetworkManagerRendering(CiTestCase):
+@@ -6032,7 +6042,11 @@ class TestNetworkManagerRendering(CiTestCase):
  
                  [ipv4]
                  method=auto
@@ -150,7 +143,7 @@ index 54d053f3..e52c2497 100644
  
                  """
                  ),
-@@ -6245,6 +6259,9 @@ iface lo inet loopback
+@@ -6298,6 +6312,9 @@ iface lo inet loopback
  
  auto eth1000
  iface eth1000 inet dhcp
@@ -160,7 +153,7 @@ index 54d053f3..e52c2497 100644
  """
          self.assertEqual(expected.lstrip(), contents.lstrip())
  
-@@ -6304,6 +6321,7 @@ class TestNetplanNetRendering:
+@@ -6357,6 +6374,7 @@ class TestNetplanNetRendering:
                    ethernets:
                      eth1000:
                        dhcp4: true
@@ -168,7 +161,7 @@ index 54d053f3..e52c2497 100644
                        match:
                          macaddress: 07-1c-c6-75-a4-be
                        set-name: eth1000
-@@ -7803,7 +7821,7 @@ class TestNetworkdNetRendering(CiTestCase):
+@@ -7856,7 +7874,7 @@ class TestNetworkdNetRendering(CiTestCase):
              Name=eth1000
              MACAddress=07-1c-c6-75-a4-be
              [Network]
@@ -177,6 +170,3 @@ index 54d053f3..e52c2497 100644
          ).rstrip(" ")
  
          expected = self.create_conf_dict(expected.splitlines())
--- 
-2.41.0
-

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

@@ -1,83 +0,0 @@
-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/0006-net-nm-check-for-presence-of-ifcfg-files-when-nm-con.patch

@@ -1,15 +1,8 @@
-From ffc8f3fbb4c8c14a4ef2b6a99a9ea61da4bedde7 Mon Sep 17 00:00:00 2001
+From c0df864e373e1e34bf23c4869acdf7d20aea7aaf 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
+Subject: [PATCH] net/nm: check for presence of ifcfg files when nm connection
+ files are absent (#4645)
 
 On systems that use network manager to manage connections and activate network
 interfaces, they may also use ifcfg files for configuring
@@ -118,6 +111,3 @@ index 8a99eb3a..76a0ac15 100644
  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/0007-test-jsonschema-Pin-jsonschema-version-4781.patch

@@ -1,14 +1,7 @@
-From c43791eeb00bc9000abff0125c18aa6a7e8b7160 Mon Sep 17 00:00:00 2001
+From e5258b60a3dbf44ef1faac91db2b45dab09de0b5 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
+Subject: [PATCH] test(jsonschema): Pin jsonschema version (#4781)
 
 Release 4.21.0 broke tests
 
@@ -43,6 +36,3 @@ index 19488b94..46a98b4c 100644
 +jsonschema<=4.20.0
  responses
  passlib
--- 
-2.41.0
-

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

@@ -1,15 +1,7 @@
-From a622a094a1f497c87a66932382265c2dbf1b88a2 Mon Sep 17 00:00:00 2001
+From 9e8fbb736d5e8db8bcf0fbc35a76bdad9251990a 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
+Subject: [PATCH] fix(clean): stop warning when running clean command (#4761)
 
 When the clean command is run, runparts is called and README in
 /etc/cloud/clean.d is not executable which leads to a warning.
@@ -22,11 +14,11 @@ 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
+The spec file under .distro/ 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`
+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.
@@ -127,6 +119,3 @@ index 62a9129b..fae3c12b 100644
  %config(noreplace) %{_sysconfdir}/cloud/cloud.cfg
  %dir               %{_sysconfdir}/cloud/cloud.cfg.d
  %config(noreplace) %{_sysconfdir}/cloud/cloud.cfg.d/*.cfg
--- 
-2.41.0
-

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

@@ -1,98 +0,0 @@
-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/0031-Improvements-for-AlmaLinux-OS-and-CloudLinux-OS.patch

@@ -0,0 +1,457 @@
+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/ci-Deprecate-the-users-ssh-authorized-keys-property-516.patch

@@ -0,0 +1,108 @@
+From 808cd6f434a4ede1441cc1f5781abf59f53c4153 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Anders=20Bj=C3=B6rklund?= <anders.f.bjorklund@gmail.com>
+Date: Mon, 22 Apr 2024 17:52:44 +0200
+Subject: [PATCH 1/3] Deprecate the users ssh-authorized-keys property (#5162)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+RH-Author: Ani Sinha <anisinha@redhat.com>
+RH-MergeRequest: 95: Deprecate the users ssh-authorized-keys property (#5162)
+RH-Jira: RHEL-45262
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
+RH-Commit: [1/3] 27d6f99519a28ae91037fe47f9ef654b7fbd6236 (anisinha/cloud-init)
+
+Deprecate the users ssh-authorized-keys property
+
+Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
+(cherry picked from commit 5205b4dd74eb2168ebbeba56579b6f116a272937)
+---
+ .../schemas/schema-cloud-config-v1.json       | 16 ++++++++++
+ .../unittests/config/test_cc_users_groups.py  | 30 +++++++++++++++++++
+ tools/.github-cla-signers                     |  1 +
+ 3 files changed, 47 insertions(+)
+
+diff --git a/cloudinit/config/schemas/schema-cloud-config-v1.json b/cloudinit/config/schemas/schema-cloud-config-v1.json
+index 8b10fe70..670ef4c2 100644
+--- a/cloudinit/config/schemas/schema-cloud-config-v1.json
++++ b/cloudinit/config/schemas/schema-cloud-config-v1.json
+@@ -272,6 +272,22 @@
+           },
+           "minItems": 1
+         },
++        "ssh-authorized-keys": {
++          "allOf": [
++            {
++              "type": "array",
++              "items": {
++                "type": "string"
++              },
++              "minItems": 1
++            },
++            {
++              "deprecated": true,
++              "deprecated_version": "18.3",
++              "deprecated_description": "Use ``ssh_authorized_keys`` instead."
++            }
++          ]
++        },
+         "ssh_import_id": {
+           "description": "List of SSH IDs to import for user. Can not be combined with ``ssh_redirect_user``.",
+           "type": "array",
+diff --git a/tests/unittests/config/test_cc_users_groups.py b/tests/unittests/config/test_cc_users_groups.py
+index 3300b77b..53e231e1 100644
+--- a/tests/unittests/config/test_cc_users_groups.py
++++ b/tests/unittests/config/test_cc_users_groups.py
+@@ -503,6 +503,36 @@ class TestUsersGroupsSchema:
+                 ),
+                 True,
+             ),
++            (
++                {
++                    "users": [
++                        {
++                            "name": "lima",
++                            "uid": "1000",
++                            "homedir": "/home/lima.linux",
++                            "shell": "/bin/bash",
++                            "sudo": "ALL=(ALL) NOPASSWD:ALL",
++                            "lock_passwd": True,
++                            "ssh-authorized-keys": ["ssh-ed25519 ..."],
++                        }
++                    ]
++                },
++                pytest.raises(
++                    SchemaValidationError,
++                    match=(
++                        "Cloud config schema deprecations: "
++                        "users.0.ssh-authorized-keys: "
++                        " Deprecated in version 18.3."
++                        " Use ``ssh_authorized_keys`` instead."
++                        ", "
++                        "users.0.uid: "
++                        " Changed in version 22.3."
++                        " The use of ``string`` type is deprecated."
++                        " Use an ``integer`` instead."
++                    ),
++                ),
++                False,
++            ),
+         ],
+     )
+     @skipUnlessJsonSchema()
+diff --git a/tools/.github-cla-signers b/tools/.github-cla-signers
+index f4da0989..8b119025 100644
+--- a/tools/.github-cla-signers
++++ b/tools/.github-cla-signers
+@@ -3,6 +3,7 @@ aciba90
+ acourdavAkamai
+ ader1990
+ adobley
++afbjorklund
+ ajmyyra
+ akutz
+ AlexBaranowski
+-- 
+2.39.3
+

SOURCES/ci-Pin-pythes-8.0.0.patch

@@ -1,20 +1,13 @@
-From 3f138f68a36224dcefd5c16befbc00486b09c8ec Mon Sep 17 00:00:00 2001
+From 7f3b0ff968409a880596e04aece4e4c504fb9c64 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
+Subject: [PATCH] ci: Pin pytest<8.0.0. (#4816)
 
 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>
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
 ---
  integration-requirements.txt | 2 +-
  test-requirements.txt        | 2 +-

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

@@ -1,14 +1,14 @@
-From 9da40a7e46e40eb090538f9d8a5aa6049fbbc5b8 Mon Sep 17 00:00:00 2001
+From cc31dc321ae35995ceff93e67aaf0b0c660aa890 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-MergeRequest: 71: Retain exit code in cloud-init status for recoverable errors
+RH-Jira: RHEL-28549
 RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
 RH-Acked-by: Cathy Avery <cavery@redhat.com>
-RH-Commit: [1/1] 8c45ffe77ed8e964c35af4705d65daaf8282038f
+RH-Commit: [1/1] 00934ade88c481c012bc1947fa44e5ed59f82858 (anisinha/cloud-init)
 
 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

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

@@ -1,15 +1,15 @@
-From ce17b057e4bd5dfaa2cc72991736a1b82704488c Mon Sep 17 00:00:00 2001
+From 72b2deeafd9276d15f20831f01b2f8c44616f33d 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-MergeRequest: 67: Revert "Use grep for faster parsing of cloud config in ds-identify (#4327)"
+RH-Jira: RHEL-22255
 RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-RH-Acked-by: Jon Maloy <jmaloy@redhat.com>
-RH-Commit: [1/1] f14ebd0055aad9340249e83381cf976debdbe38d
+RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
+RH-Commit: [1/1] 5997598254cd16ea7f26d87212b0f09920fcdf50 (anisinha/cloud-init)
 
 This reverts commit 816e05d4830f5e789f1f85ef926e2849156bff3a.
 
@@ -238,5 +238,5 @@ index 7a537278..ec2cc18a 100755
          _RET="$ret"
          _RET_fname="$found_fn"
 -- 
-2.41.0
+2.39.3
 

SOURCES/ci-Revert-fix-vmware-Set-IPv6-to-dhcp-when-there-is-no-.patch

@@ -0,0 +1,190 @@
+From 87db4f8680222d2579d0ffb5fe507231f88d8aa5 Mon Sep 17 00:00:00 2001
+From: PengpengSun <40026211+PengpengSun@users.noreply.github.com>
+Date: Sat, 10 Aug 2024 03:32:40 +0800
+Subject: [PATCH] Revert "fix(vmware): Set IPv6 to dhcp when there is no IPv6
+ addr (#5471)" (#5596)
+
+RH-Author: xiachen <xiachen@redhat.com>
+RH-MergeRequest: 108: Revert "fix(vmware): Set IPv6 to dhcp when there is no IPv6 addr (#5471)" (#5596)
+RH-Jira: RHEL-54373
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
+RH-Commit: [1/1] 96cccfca3d29c95d9c491d5995b7aa96adec4621 (xiachen/cloud-init-centos)
+
+This reverts commit 2b6fe6403db769de14f7c7b7e4aa65f5bea8f3e0.
+
+When there is no IPv6 set to dhcp explicitly, NetworkManager keyfile
+defaults to method=auto, may-fail=true. When there is Ipv6 set to dhcp
+explictily, NetworkManager keyfile will be set to
+method=auto, may-fail=false. The default settings are what we want, so
+revert the previous change to keep IPv6 not set explicitly.
+
+(cherry picked from commit 65014b97420b41dcb6e7ea17c66bb2539f9b09fc)
+Signed-off-by: Amy Chen <xiachen@redhat.com>
+---
+ .../sources/helpers/vmware/imc/config_nic.py  |  2 +-
+ .../sources/vmware/test_vmware_config_file.py | 68 +++++--------------
+ 2 files changed, 18 insertions(+), 52 deletions(-)
+
+diff --git a/cloudinit/sources/helpers/vmware/imc/config_nic.py b/cloudinit/sources/helpers/vmware/imc/config_nic.py
+index 254518af..b07214a2 100644
+--- a/cloudinit/sources/helpers/vmware/imc/config_nic.py
++++ b/cloudinit/sources/helpers/vmware/imc/config_nic.py
+@@ -207,7 +207,7 @@ class NicConfigurator:
+         """
+ 
+         if not nic.staticIpv6:
+-            return ([{"type": "dhcp6"}], [])
++            return ([], [])
+ 
+         subnet_list = []
+         # Static Ipv6
+diff --git a/tests/unittests/sources/vmware/test_vmware_config_file.py b/tests/unittests/sources/vmware/test_vmware_config_file.py
+index 25d3b093..b53ea96c 100644
+--- a/tests/unittests/sources/vmware/test_vmware_config_file.py
++++ b/tests/unittests/sources/vmware/test_vmware_config_file.py
+@@ -240,45 +240,27 @@ class TestVmwareConfigFile(CiTestCase):
+             elif cfg.get("name") == nic2.get("name"):
+                 nic2.update(cfg)
+ 
+-        # Test NIC1
+         self.assertEqual("physical", nic1.get("type"), "type of NIC1")
+         self.assertEqual("NIC1", nic1.get("name"), "name of NIC1")
+         self.assertEqual(
+             "00:50:56:a6:8c:08", nic1.get("mac_address"), "mac address of NIC1"
+         )
+         subnets = nic1.get("subnets")
+-        self.assertEqual(2, len(subnets), "number of subnets for NIC1")
+-        subnet_ipv4 = subnets[0]
+-        self.assertEqual(
+-            "dhcp", subnet_ipv4.get("type"), "Ipv4 DHCP type for NIC1"
+-        )
+-        self.assertEqual(
+-            "auto", subnet_ipv4.get("control"), "NIC1 Control type"
+-        )
+-        subnet_ipv6 = subnets[1]
+-        self.assertEqual(
+-            "dhcp6", subnet_ipv6.get("type"), "Ipv6 DHCP type for NIC1"
+-        )
++        self.assertEqual(1, len(subnets), "number of subnets for NIC1")
++        subnet = subnets[0]
++        self.assertEqual("dhcp", subnet.get("type"), "DHCP type for NIC1")
++        self.assertEqual("auto", subnet.get("control"), "NIC1 Control type")
+ 
+-        # Test NIC2
+         self.assertEqual("physical", nic2.get("type"), "type of NIC2")
+         self.assertEqual("NIC2", nic2.get("name"), "name of NIC2")
+         self.assertEqual(
+             "00:50:56:a6:5a:de", nic2.get("mac_address"), "mac address of NIC2"
+         )
+         subnets = nic2.get("subnets")
+-        self.assertEqual(2, len(subnets), "number of subnets for NIC2")
+-        subnet_ipv4 = subnets[0]
+-        self.assertEqual(
+-            "dhcp", subnet_ipv4.get("type"), "Ipv4 DHCP type for NIC2"
+-        )
+-        self.assertEqual(
+-            "auto", subnet_ipv4.get("control"), "NIC2 Control type"
+-        )
+-        subnet_ipv6 = subnets[1]
+-        self.assertEqual(
+-            "dhcp6", subnet_ipv6.get("type"), "Ipv6 DHCP type for NIC2"
+-        )
++        self.assertEqual(1, len(subnets), "number of subnets for NIC2")
++        subnet = subnets[0]
++        self.assertEqual("dhcp", subnet.get("type"), "DHCP type for NIC2")
++        self.assertEqual("auto", subnet.get("control"), "NIC2 Control type")
+ 
+     def test_get_nics_list_static(self):
+         """Tests if NicConfigurator properly calculates network subnets
+@@ -303,7 +285,6 @@ class TestVmwareConfigFile(CiTestCase):
+                 elif cfg.get("name") == nic2.get("name"):
+                     nic2.update(cfg)
+ 
+-        # Test NIC1
+         self.assertEqual("physical", nic1.get("type"), "type of NIC1")
+         self.assertEqual("NIC1", nic1.get("name"), "name of NIC1")
+         self.assertEqual(
+@@ -363,7 +344,6 @@ class TestVmwareConfigFile(CiTestCase):
+             else:
+                 self.assertEqual(True, False, "invalid gateway %s" % (gateway))
+ 
+-        # Test NIC2
+         self.assertEqual("physical", nic2.get("type"), "type of NIC2")
+         self.assertEqual("NIC2", nic2.get("name"), "name of NIC2")
+         self.assertEqual(
+@@ -371,18 +351,16 @@ class TestVmwareConfigFile(CiTestCase):
+         )
+ 
+         subnets = nic2.get("subnets")
+-        self.assertEqual(2, len(subnets), "Number of subnets for NIC2")
++        self.assertEqual(1, len(subnets), "Number of subnets for NIC2")
+ 
+-        subnet_ipv4 = subnets[0]
+-        self.assertEqual("static", subnet_ipv4.get("type"), "Subnet type")
++        subnet = subnets[0]
++        self.assertEqual("static", subnet.get("type"), "Subnet type")
+         self.assertEqual(
+-            "192.168.6.102", subnet_ipv4.get("address"), "Subnet address"
++            "192.168.6.102", subnet.get("address"), "Subnet address"
+         )
+         self.assertEqual(
+-            "255.255.0.0", subnet_ipv4.get("netmask"), "Subnet netmask"
++            "255.255.0.0", subnet.get("netmask"), "Subnet netmask"
+         )
+-        subnet_ipv6 = subnets[1]
+-        self.assertEqual("dhcp6", subnet_ipv6.get("type"), "Subnet type")
+ 
+     def test_custom_script(self):
+         cf = ConfigFile("tests/data/vmware/cust-dhcp-2nic.cfg")
+@@ -469,10 +447,7 @@ class TestVmwareNetConfig(CiTestCase):
+                             "type": "static",
+                             "address": "10.20.87.154",
+                             "netmask": "255.255.252.0",
+-                        },
+-                        {
+-                            "type": "dhcp6",
+-                        },
++                        }
+                     ],
+                 }
+             ],
+@@ -523,10 +498,7 @@ class TestVmwareNetConfig(CiTestCase):
+                                     "metric": 10000,
+                                 }
+                             ],
+-                        },
+-                        {
+-                            "type": "dhcp6",
+-                        },
++                        }
+                     ],
+                 }
+             ],
+@@ -586,10 +558,7 @@ class TestVmwareNetConfig(CiTestCase):
+                                     "metric": 10000,
+                                 }
+                             ],
+-                        },
+-                        {
+-                            "type": "dhcp6",
+-                        },
++                        }
+                     ],
+                 }
+             ],
+@@ -634,10 +603,7 @@ class TestVmwareNetConfig(CiTestCase):
+                             "address": "10.20.87.154",
+                             "netmask": "255.255.252.0",
+                             "gateway": "10.20.87.253",
+-                        },
+-                        {
+-                            "type": "dhcp6",
+-                        },
++                        }
+                     ],
+                 }
+             ],
+-- 
+2.39.3
+

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

@@ -1,108 +0,0 @@
-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-Support-metalink-in-yum-repository-config-5444.patch

@@ -0,0 +1,140 @@
+From 96b10adc942f5117e35584d28ba88071849e8e29 Mon Sep 17 00:00:00 2001
+From: Ani Sinha <anisinha@redhat.com>
+Date: Thu, 27 Jun 2024 18:38:22 +0530
+Subject: [PATCH 1/2] Support metalink in yum repository config (#5444)
+
+RH-Author: xiachen <xiachen@redhat.com>
+RH-MergeRequest: 97: Support metalink in yum repository config (#5444)
+RH-Jira: RHEL-44916
+RH-Acked-by: Ani Sinha <anisinha@redhat.com>
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Commit: [1/1] 4671fd3a3f6842f1f590d5a89a429facd0d8bb4d (xiachen/cloud-init-centos)
+
+'metalink' config can be specified instead or along with 'baseurl' in the yum
+repository config. Add support for specifying metalink instead of 'baseurl'.
+
+Fixes GH-5359
+
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+Co-authored-by: Ben Gray <ben.gray@clearcapital.com>
+(cherry picked from commit 525026061404ef09baebb85631d9af3b0a4d8930)
+---
+ cloudinit/config/cc_yum_add_repo.py           | 24 ++++++------
+ doc/examples/cloud-config-yum-repo.txt        |  3 +-
+ .../unittests/config/test_cc_yum_add_repo.py  | 38 +++++++++++++++++++
+ 3 files changed, 51 insertions(+), 14 deletions(-)
+
+diff --git a/cloudinit/config/cc_yum_add_repo.py b/cloudinit/config/cc_yum_add_repo.py
+index 1ab5008f..4fd66250 100644
+--- a/cloudinit/config/cc_yum_add_repo.py
++++ b/cloudinit/config/cc_yum_add_repo.py
+@@ -210,24 +210,22 @@ def handle(name: str, cfg: Config, cloud: Cloud, args: list) -> None:
+                 n_repo_config[k] = v
+         repo_config = n_repo_config
+         missing_required = 0
+-        for req_field in ["baseurl"]:
++        req_fields = ["baseurl", "metalink"]
++        for req_field in req_fields:
+             if req_field not in repo_config:
+-                LOG.warning(
+-                    "Repository %s does not contain a %s"
+-                    " configuration 'required' entry",
+-                    repo_id,
+-                    req_field,
+-                )
+                 missing_required += 1
+-        if not missing_required:
+-            repo_configs[canon_repo_id] = repo_config
+-            repo_locations[canon_repo_id] = repo_fn_pth
+-        else:
++
++        if missing_required == len(req_fields):
+             LOG.warning(
+-                "Repository %s is missing %s required fields, skipping!",
++                "Repository %s should contain atleast one of the"
++                " following configuration entries: %s, skipping!",
+                 repo_id,
+-                missing_required,
++                ", ".join(req_fields),
+             )
++        else:
++            repo_configs[canon_repo_id] = repo_config
++            repo_locations[canon_repo_id] = repo_fn_pth
++
+     for (c_repo_id, path) in repo_locations.items():
+         repo_blob = _format_repository_config(
+             c_repo_id, repo_configs.get(c_repo_id)
+diff --git a/doc/examples/cloud-config-yum-repo.txt b/doc/examples/cloud-config-yum-repo.txt
+index e8f2bbb4..6a4037e2 100644
+--- a/doc/examples/cloud-config-yum-repo.txt
++++ b/doc/examples/cloud-config-yum-repo.txt
+@@ -11,8 +11,9 @@ yum_repos:
+     # Any repository configuration options
+     # See: man yum.conf
+     #
+-    # This one is required!
++    # At least one of 'baseurl' or 'metalink' is required!
+     baseurl: http://download.fedoraproject.org/pub/epel/testing/5/$basearch
++    metalink: https://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch&infra=$infra&content=$contentdir
+     enabled: false
+     failovermethod: priority
+     gpgcheck: true
+diff --git a/tests/unittests/config/test_cc_yum_add_repo.py b/tests/unittests/config/test_cc_yum_add_repo.py
+index d2c2912f..1f27d1fb 100644
+--- a/tests/unittests/config/test_cc_yum_add_repo.py
++++ b/tests/unittests/config/test_cc_yum_add_repo.py
+@@ -31,6 +31,7 @@ class TestConfig(helpers.FilesystemMockingTestCase):
+             "yum_repos": {
+                 "epel-testing": {
+                     "name": "Extra Packages for Enterprise Linux 5 - Testing",
++                    # At least one of baseurl or metalink must be present.
+                     # Missing this should cause the repo not to be written
+                     # 'baseurl': 'http://blah.org/pub/epel/testing/5/$barch',
+                     "enabled": False,
+@@ -46,6 +47,43 @@ class TestConfig(helpers.FilesystemMockingTestCase):
+             IOError, util.load_file, "/etc/yum.repos.d/epel_testing.repo"
+         )
+ 
++    def test_metalink_config(self):
++        cfg = {
++            "yum_repos": {
++                "epel-testing": {
++                    "name": "Extra Packages for Enterprise Linux 5 - Testing",
++                    "metalink": "http://blah.org/pub/epel/testing/5/$basearch",
++                    "enabled": False,
++                    "gpgcheck": True,
++                    "gpgkey": "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL",
++                    "failovermethod": "priority",
++                },
++            },
++        }
++        self.patchUtils(self.tmp)
++        self.patchOS(self.tmp)
++        cc_yum_add_repo.handle("yum_add_repo", cfg, None, [])
++        contents = util.load_file("/etc/yum.repos.d/epel-testing.repo")
++        parser = configparser.ConfigParser()
++        parser.read_string(contents)
++        expected = {
++            "epel-testing": {
++                "name": "Extra Packages for Enterprise Linux 5 - Testing",
++                "failovermethod": "priority",
++                "gpgkey": "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL",
++                "enabled": "0",
++                "metalink": "http://blah.org/pub/epel/testing/5/$basearch",
++                "gpgcheck": "1",
++            }
++        }
++        for section in expected:
++            self.assertTrue(
++                parser.has_section(section),
++                "Contains section {0}".format(section),
++            )
++            for k, v in expected[section].items():
++                self.assertEqual(parser.get(section, k), v)
++
+     def test_write_config(self):
+         cfg = {
+             "yum_repos": {
+-- 
+2.39.3
+

SOURCES/ci-Support-setting-mirrorlist-in-yum-repository-config-.patch

@@ -0,0 +1,145 @@
+From d27ac077dac3474fea3c7bb1a19afe50ecbcc64d Mon Sep 17 00:00:00 2001
+From: Ani Sinha <anisinha@redhat.com>
+Date: Thu, 18 Jul 2024 13:36:39 +0530
+Subject: [PATCH 2/2] Support setting mirrorlist in yum repository config
+ (#5522)
+
+RH-Author: xiachen <xiachen@redhat.com>
+RH-MergeRequest: 104: Support setting mirrorlist in yum repository config (#5522)
+RH-Jira: RHEL-49674
+RH-Acked-by: Ani Sinha <anisinha@redhat.com>
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Commit: [1/1] 4605a0304c6bed6614990b7194465230afa79778 (xiachen/cloud-init-centos)
+
+'mirrorlist' config can be specified instead or along with 'baseurl' in the yum
+repository config. Add support for specifying mirrorlist instead of 'baseurl'.
+
+Fixes GH-5520
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+(cherry picked from commit 0b4084374440d2a5a9968129e0460a1a009d9830)
+Signed-off-by: Amy Chen <xiachen@redhat.com>
+---
+ cloudinit/config/cc_yum_add_repo.py           |  2 +-
+ .../schemas/schema-cloud-config-v1.json       | 10 +++++
+ doc/examples/cloud-config-yum-repo.txt        |  3 +-
+ .../unittests/config/test_cc_yum_add_repo.py  | 40 ++++++++++++++++++-
+ 4 files changed, 52 insertions(+), 3 deletions(-)
+
+diff --git a/cloudinit/config/cc_yum_add_repo.py b/cloudinit/config/cc_yum_add_repo.py
+index 4fd66250..3870d24e 100644
+--- a/cloudinit/config/cc_yum_add_repo.py
++++ b/cloudinit/config/cc_yum_add_repo.py
+@@ -210,7 +210,7 @@ def handle(name: str, cfg: Config, cloud: Cloud, args: list) -> None:
+                 n_repo_config[k] = v
+         repo_config = n_repo_config
+         missing_required = 0
+-        req_fields = ["baseurl", "metalink"]
++        req_fields = ["baseurl", "metalink", "mirrorlist"]
+         for req_field in req_fields:
+             if req_field not in repo_config:
+                 missing_required += 1
+diff --git a/cloudinit/config/schemas/schema-cloud-config-v1.json b/cloudinit/config/schemas/schema-cloud-config-v1.json
+index 4fb7fd93..c5f46f37 100644
+--- a/cloudinit/config/schemas/schema-cloud-config-v1.json
++++ b/cloudinit/config/schemas/schema-cloud-config-v1.json
+@@ -3447,6 +3447,11 @@
+                   "format": "uri",
+                   "description": "Specifies a URL to a metalink file for the repomd.xml"
+                 },
++                "mirrorlist": {
++                  "type": "string",
++                  "format": "uri",
++                  "description": "Specifies a URL to a file containing a baseurls list"
++                },
+                 "name": {
+                   "type": "string",
+                   "description": "Optional human-readable name of the yum repo."
+@@ -3484,6 +3489,11 @@
+                   "required": [
+                     "metalink"
+                   ]
++                },
++                {
++                  "required": [
++                    "mirrorlist"
++                  ]
+                 }
+               ]
+             }
+diff --git a/doc/examples/cloud-config-yum-repo.txt b/doc/examples/cloud-config-yum-repo.txt
+index 6a4037e2..cee26677 100644
+--- a/doc/examples/cloud-config-yum-repo.txt
++++ b/doc/examples/cloud-config-yum-repo.txt
+@@ -11,9 +11,10 @@ yum_repos:
+     # Any repository configuration options
+     # See: man yum.conf
+     #
+-    # At least one of 'baseurl' or 'metalink' is required!
++    # At least one of 'baseurl' or 'metalink' or 'mirrorlist' is required!
+     baseurl: http://download.fedoraproject.org/pub/epel/testing/5/$basearch
+     metalink: https://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch&infra=$infra&content=$contentdir
++    mirrorlist: https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&
+     enabled: false
+     failovermethod: priority
+     gpgcheck: true
+diff --git a/tests/unittests/config/test_cc_yum_add_repo.py b/tests/unittests/config/test_cc_yum_add_repo.py
+index 1f27d1fb..000792b4 100644
+--- a/tests/unittests/config/test_cc_yum_add_repo.py
++++ b/tests/unittests/config/test_cc_yum_add_repo.py
+@@ -31,7 +31,8 @@ class TestConfig(helpers.FilesystemMockingTestCase):
+             "yum_repos": {
+                 "epel-testing": {
+                     "name": "Extra Packages for Enterprise Linux 5 - Testing",
+-                    # At least one of baseurl or metalink must be present.
++                    # At least one of baseurl or metalink or mirrorlist
++                    # must be present.
+                     # Missing this should cause the repo not to be written
+                     # 'baseurl': 'http://blah.org/pub/epel/testing/5/$barch',
+                     "enabled": False,
+@@ -84,6 +85,43 @@ class TestConfig(helpers.FilesystemMockingTestCase):
+             for k, v in expected[section].items():
+                 self.assertEqual(parser.get(section, k), v)
+ 
++    def test_mirrorlist_config(self):
++        cfg = {
++            "yum_repos": {
++                "epel-testing": {
++                    "name": "Extra Packages for Enterprise Linux 5 - Testing",
++                    "mirrorlist": "http://mirrors.blah.org/metalink?repo=rhel-$releasever",
++                    "enabled": False,
++                    "gpgcheck": True,
++                    "gpgkey": "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL",
++                    "failovermethod": "priority",
++                },
++            },
++        }
++        self.patchUtils(self.tmp)
++        self.patchOS(self.tmp)
++        cc_yum_add_repo.handle("yum_add_repo", cfg, None, [])
++        contents = util.load_file("/etc/yum.repos.d/epel-testing.repo")
++        parser = configparser.ConfigParser()
++        parser.read_string(contents)
++        expected = {
++            "epel-testing": {
++                "name": "Extra Packages for Enterprise Linux 5 - Testing",
++                "failovermethod": "priority",
++                "gpgkey": "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL",
++                "enabled": "0",
++                "mirrorlist": "http://mirrors.blah.org/metalink?repo=rhel-$releasever",
++                "gpgcheck": "1",
++            }
++        }
++        for section in expected:
++            self.assertTrue(
++                parser.has_section(section),
++                "Contains section {0}".format(section),
++            )
++            for k, v in expected[section].items():
++                self.assertEqual(parser.get(section, k), v)
++
+     def test_write_config(self):
+         cfg = {
+             "yum_repos": {
+-- 
+2.39.3
+

SOURCES/ci-Update-pylint-version-to-support-python-3.12-5338.patch

@@ -0,0 +1,235 @@
+From c34f5c4275c3ef7bee9a99e87bf6e37c5886b160 Mon Sep 17 00:00:00 2001
+From: Ani Sinha <anisinha@redhat.com>
+Date: Wed, 29 May 2024 03:34:38 +0530
+Subject: [PATCH 6/6] Update pylint version to support python 3.12 (#5338)
+
+RH-Author: Ani Sinha <anisinha@redhat.com>
+RH-MergeRequest: 92: Update pylint version to support python 3.12
+RH-Jira: RHEL-44598
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
+RH-Commit: [3/3] d6185e0a126e1589260ee59709fe933b5a780b78 (anisinha/cloud-init)
+
+Fedora 39 and above comes with python version 3.12. When running `tox -e pylint`
+on cloud-init, we may experience issue such as the one reported here:
+https://github.com/pylint-dev/pylint/issues/8782
+
+Minimum version of pylint required in order to support python 3.12 is 3.0.2.
+Please see https://github.com/pylint-dev/astroid/issues/2201 . Upon further
+experimentation, it is seen that we need minimum pylint version 3.2.0 for
+cloud-init. Update tox.ini in order to use this pylint version.
+
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+(cherry picked from commit 5ad609ffdf4bb76c5665e12e34e1867b72bd4435)
+
+ Conflicts:
+	cloudinit/sources/DataSourceWSL.py (does not exist)
+	cloudinit/util.py (doc added upstream)
+---
+ cloudinit/config/cc_mounts.py         | 4 ++++
+ cloudinit/distros/bsd.py              | 2 ++
+ cloudinit/distros/netbsd.py           | 2 +-
+ cloudinit/sources/DataSourceAzure.py  | 2 +-
+ cloudinit/sources/DataSourceEc2.py    | 3 ++-
+ cloudinit/sources/DataSourceLXD.py    | 2 +-
+ tests/integration_tests/conftest.py   | 6 +++---
+ tests/integration_tests/util.py       | 2 +-
+ tests/unittests/config/test_cc_ntp.py | 2 ++
+ tests/unittests/sources/test_gce.py   | 1 +
+ tests/unittests/test_util.py          | 2 ++
+ tox.ini                               | 2 +-
+ 12 files changed, 21 insertions(+), 9 deletions(-)
+
+diff --git a/cloudinit/config/cc_mounts.py b/cloudinit/config/cc_mounts.py
+index 4efa2a29..d445b440 100644
+--- a/cloudinit/config/cc_mounts.py
++++ b/cloudinit/config/cc_mounts.py
+@@ -304,6 +304,10 @@ def create_swapfile(fname: str, size: str) -> None:
+                 "bs=1M",
+                 "count=%s" % size,
+             ]
++        else:
++            raise subp.ProcessExecutionError(
++                "Missing dependency: 'dd' and 'fallocate' are not available"
++            )
+ 
+         try:
+             subp.subp(cmd, capture=True)
+diff --git a/cloudinit/distros/bsd.py b/cloudinit/distros/bsd.py
+index 761cf5c4..77e0385f 100644
+--- a/cloudinit/distros/bsd.py
++++ b/cloudinit/distros/bsd.py
+@@ -120,6 +120,8 @@ class BSD(distros.Distro):
+             if not self.pkg_cmd_upgrade_prefix:
+                 return
+             cmd = self.pkg_cmd_upgrade_prefix
++        else:
++            cmd = []
+ 
+         if args and isinstance(args, str):
+             cmd.append(args)
+diff --git a/cloudinit/distros/netbsd.py b/cloudinit/distros/netbsd.py
+index a5678907..b7f3f3d8 100644
+--- a/cloudinit/distros/netbsd.py
++++ b/cloudinit/distros/netbsd.py
+@@ -12,7 +12,7 @@ import cloudinit.distros.bsd
+ from cloudinit import subp, util
+ 
+ try:
+-    import crypt
++    import crypt  # pylint: disable=W4901
+ 
+     salt = crypt.METHOD_BLOWFISH  # pylint: disable=E1101
+     blowfish_hash: Any = functools.partial(
+diff --git a/cloudinit/sources/DataSourceAzure.py b/cloudinit/sources/DataSourceAzure.py
+index 11c14e20..eb0304c3 100644
+--- a/cloudinit/sources/DataSourceAzure.py
++++ b/cloudinit/sources/DataSourceAzure.py
+@@ -51,7 +51,7 @@ from cloudinit.sources.helpers.azure import (
+ from cloudinit.url_helper import UrlError
+ 
+ try:
+-    import crypt
++    import crypt  # pylint: disable=W4901
+ 
+     blowfish_hash: Any = functools.partial(
+         crypt.crypt, salt=f"$6${util.rand_str(strlen=16)}"
+diff --git a/cloudinit/sources/DataSourceEc2.py b/cloudinit/sources/DataSourceEc2.py
+index 9e6bfbd1..384e4074 100644
+--- a/cloudinit/sources/DataSourceEc2.py
++++ b/cloudinit/sources/DataSourceEc2.py
+@@ -312,6 +312,8 @@ class DataSourceEc2(sources.DataSource):
+         return None
+ 
+     def wait_for_metadata_service(self):
++        urls = []
++        start_time = 0
+         mcfg = self.ds_cfg
+ 
+         url_params = self.get_url_params()
+@@ -345,7 +347,6 @@ class DataSourceEc2(sources.DataSource):
+             and self.cloud_name not in IDMSV2_SUPPORTED_CLOUD_PLATFORMS
+         ):
+             # if we can't get a token, use instance-id path
+-            urls = []
+             url2base = {}
+             url_path = "{ver}/meta-data/instance-id".format(
+                 ver=self.min_metadata_version
+diff --git a/cloudinit/sources/DataSourceLXD.py b/cloudinit/sources/DataSourceLXD.py
+index cd316101..4c95b907 100644
+--- a/cloudinit/sources/DataSourceLXD.py
++++ b/cloudinit/sources/DataSourceLXD.py
+@@ -331,7 +331,7 @@ class MetaDataKeys(Flag):
+     CONFIG = auto()
+     DEVICES = auto()
+     META_DATA = auto()
+-    ALL = CONFIG | DEVICES | META_DATA
++    ALL = CONFIG | DEVICES | META_DATA  # pylint: disable=E1131
+ 
+ 
+ class _MetaDataReader:
+diff --git a/tests/integration_tests/conftest.py b/tests/integration_tests/conftest.py
+index fa729b7d..ec211a00 100644
+--- a/tests/integration_tests/conftest.py
++++ b/tests/integration_tests/conftest.py
+@@ -241,7 +241,7 @@ def _client(
+ 
+ 
+ @pytest.fixture
+-def client(
++def client(  # pylint: disable=W0135
+     request, fixture_utils, session_cloud, setup_image
+ ) -> Iterator[IntegrationInstance]:
+     """Provide a client that runs for every test."""
+@@ -250,7 +250,7 @@ def client(
+ 
+ 
+ @pytest.fixture(scope="module")
+-def module_client(
++def module_client(  # pylint: disable=W0135
+     request, fixture_utils, session_cloud, setup_image
+ ) -> Iterator[IntegrationInstance]:
+     """Provide a client that runs once per module."""
+@@ -259,7 +259,7 @@ def module_client(
+ 
+ 
+ @pytest.fixture(scope="class")
+-def class_client(
++def class_client(  # pylint: disable=W0135
+     request, fixture_utils, session_cloud, setup_image
+ ) -> Iterator[IntegrationInstance]:
+     """Provide a client that runs once per class."""
+diff --git a/tests/integration_tests/util.py b/tests/integration_tests/util.py
+index 0a15203c..e26e466c 100644
+--- a/tests/integration_tests/util.py
++++ b/tests/integration_tests/util.py
+@@ -182,7 +182,7 @@ def wait_for_cloud_init(client: IntegrationInstance, num_retries: int = 30):
+         except Exception as e:
+             last_exception = e
+         time.sleep(1)
+-    raise Exception(
++    raise Exception(  # pylint: disable=W0719
+         "cloud-init status did not return successfully."
+     ) from last_exception
+ 
+diff --git a/tests/unittests/config/test_cc_ntp.py b/tests/unittests/config/test_cc_ntp.py
+index a9444ec5..c9ce5daa 100644
+--- a/tests/unittests/config/test_cc_ntp.py
++++ b/tests/unittests/config/test_cc_ntp.py
+@@ -248,6 +248,7 @@ class TestNtp(FilesystemMockingTestCase):
+                     )
+ 
+     def _get_expected_pools(self, pools, distro, client):
++        expected_pools = None
+         if client in ["ntp", "chrony"]:
+             if client == "ntp" and distro == "alpine":
+                 # NTP for Alpine Linux is Busybox's ntp which does not
+@@ -263,6 +264,7 @@ class TestNtp(FilesystemMockingTestCase):
+         return expected_pools
+ 
+     def _get_expected_servers(self, servers, distro, client):
++        expected_servers = None
+         if client in ["ntp", "chrony"]:
+             if client == "ntp" and distro == "alpine":
+                 # NTP for Alpine Linux is Busybox's ntp which only supports
+diff --git a/tests/unittests/sources/test_gce.py b/tests/unittests/sources/test_gce.py
+index c0b19d3c..30a50236 100644
+--- a/tests/unittests/sources/test_gce.py
++++ b/tests/unittests/sources/test_gce.py
+@@ -101,6 +101,7 @@ class TestDataSourceGCE(test_helpers.ResponsesTestCase):
+             gce_meta = GCE_META
+ 
+         def _request_callback(request):
++            recursive = False
+             url_path = urlparse(request.url).path
+             if url_path.startswith("/computeMetadata/v1/"):
+                 path = url_path.split("/computeMetadata/v1/")[1:][0]
+diff --git a/tests/unittests/test_util.py b/tests/unittests/test_util.py
+index 519ef63c..de1326d4 100644
+--- a/tests/unittests/test_util.py
++++ b/tests/unittests/test_util.py
+@@ -1677,6 +1677,8 @@ class TestRedirectOutputPreexecFn:
+             args = (test_string, None)
+         elif request.param == "errfmt":
+             args = (None, test_string)
++        else:
++            args = (None, None)
+         with mock.patch(M_PATH + "subprocess.Popen") as m_popen:
+             util.redirect_output(*args)
+ 
+diff --git a/tox.ini b/tox.ini
+index 5f01a9a8..5199ca13 100644
+--- a/tox.ini
++++ b/tox.ini
+@@ -25,7 +25,7 @@ hypothesis==6.31.6
+ hypothesis_jsonschema==0.20.1
+ isort==5.10.1
+ mypy==0.950
+-pylint==2.13.9
++pylint==3.2.0
+ pytest==7.0.1
+ ruff==0.0.285
+ types-jsonschema==4.4.2
+-- 
+2.39.3
+

SOURCES/ci-doc-update-examples-to-reflect-alternative-ways-to-p.patch

@@ -0,0 +1,51 @@
+From 52c04e1a523a450dfce70bc441963eb6a026eb59 Mon Sep 17 00:00:00 2001
+From: Ani Sinha <anisinha@redhat.com>
+Date: Thu, 20 Jun 2024 11:18:40 +0530
+Subject: [PATCH 3/6] doc: update examples to reflect alternative ways to
+ provide `sudo` option (#5418)
+
+RH-Author: Ani Sinha <anisinha@redhat.com>
+RH-MergeRequest: 90: fix(jsonschema): Add missing sudo definition (#5418)
+RH-Jira: RHEL-44337
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
+RH-Commit: [2/2] 62eac6d731cb725c32cd0beac0219ecc2b407198 (anisinha/cloud-init)
+
+For creating users and groups, it is possible to pass a `sudo` option to the
+config file that accepts a sudo rule. The option can be a sudo rule string,
+a list of sudo rule strings or `False` to explicitly deny sudo usage. Update
+examples to show how a list of strings can be used with `sudo` option.
+
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+(cherry picked from commit cbcb05349e35023ee6e81ccaf13e79adb8f65f63)
+---
+ doc/examples/cloud-config-user-groups.txt | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/doc/examples/cloud-config-user-groups.txt b/doc/examples/cloud-config-user-groups.txt
+index 87fc52e8..56eb674f 100644
+--- a/doc/examples/cloud-config-user-groups.txt
++++ b/doc/examples/cloud-config-user-groups.txt
+@@ -35,6 +35,10 @@ users:
+     lock_passwd: true
+     ssh_authorized_keys:
+       - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDSL7uWGj8cgWyIOaspgKdVy0cKJ+UTjfv7jBOjG2H/GN8bJVXy72XAvnhM0dUM+CCs8FOf0YlPX+Frvz2hKInrmRhZVwRSL129PasD12MlI3l44u6IwS1o/W86Q+tkQYEljtqDOo0a+cOsaZkvUNzUyEXUwz/lmYa6G4hMKZH4NBj7nbAAF96wsMCoyNwbWryBnDYUr6wMbjRR1J9Pw7Xh7WRC73wy4Va2YuOgbD3V/5ZrFPLbWZW/7TFXVrql04QVbyei4aiFR5n//GvoqwQDNe58LmbzX/xvxyKJYdny2zXmdAhMxbrpFQsfpkJ9E/H5w0yOdSvnWbUoG5xNGoOB csmith@fringe
++  - name: testuser
++    gecos: Mr. Test
++    homedir: /local/testdir
++    sudo: ["ALL=(ALL) NOPASSWD:ALL"]
+   - name: cloudy
+     gecos: Magic Cloud App Daemon User
+     inactive: '5'
+@@ -100,6 +104,8 @@ users:
+ #
+ #         Allow a user unrestricted sudo access.
+ #             sudo:  ALL=(ALL) NOPASSWD:ALL
++#                       or
++#             sudo: ["ALL=(ALL) NOPASSWD:ALL"]
+ #
+ #         Adding multiple sudo rule strings.
+ #             sudo:
+-- 
+2.39.3
+

SOURCES/ci-docs-Add-deprecated-system_info-to-schema-5168.patch

@@ -0,0 +1,166 @@
+From c933187af44a5de1d6eafde5dcd48e8ac369cf34 Mon Sep 17 00:00:00 2001
+From: James Falcon <james.falcon@canonical.com>
+Date: Thu, 18 Apr 2024 20:21:14 -0500
+Subject: [PATCH 2/3] docs: Add deprecated system_info to schema (#5168)
+
+RH-Author: Ani Sinha <anisinha@redhat.com>
+RH-MergeRequest: 95: Deprecate the users ssh-authorized-keys property (#5162)
+RH-Jira: RHEL-45262
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
+RH-Commit: [2/3] c4ea6f45ee0997e2f749c290fb8f2ceb8c05c691 (anisinha/cloud-init)
+
+In some cases, `system_info` can be passed via user data or vendor data
+to override the system_info in /etc/cloud/cloud.cfg . While this
+technically can work, this is a use case we no longer support and should
+indicate that it is deprecated.
+
+Also remove/update examples.
+
+(cherry picked from commit 7c67f7732f04b41600934818f7d5bcb4d085ed7c)
+
+Conflicts:
+	cloudinit/config/schemas/schema-cloud-config-v1.json
+	  - due to change fdefe08ad19cea5eb ("fix: Fix typos (#4850)") not
+	    present in downstream.
+	doc/examples/cloud-config-user-groups.txt
+	  - due to change 0aa17cd10bdd6 ("docs: set the home directory using homedir, not home (#5101)")
+	    not present downstream.
+	tests/unittests/sources/test_vultr.py
+	  - due to change 144782a838 ("test: Remove side effects from tests (#5074)") not present
+	    downstream.
+---
+ .../schemas/schema-cloud-config-v1.json       |  7 ++++++
+ doc/examples/cloud-config-apt.txt             | 23 -------------------
+ doc/examples/cloud-config-user-groups.txt     | 12 ++--------
+ tests/data/user_data.1.txt                    | 10 --------
+ tests/unittests/runs/test_merge_run.py        | 16 ++++++++++++-
+ 5 files changed, 24 insertions(+), 44 deletions(-)
+
+diff --git a/cloudinit/config/schemas/schema-cloud-config-v1.json b/cloudinit/config/schemas/schema-cloud-config-v1.json
+index 670ef4c2..97cf2b74 100644
+--- a/cloudinit/config/schemas/schema-cloud-config-v1.json
++++ b/cloudinit/config/schemas/schema-cloud-config-v1.json
+@@ -513,6 +513,12 @@
+         },
+         "merge_type": {
+           "$ref": "#/$defs/merge_defintion"
++        },
++        "system_info": {
++          "type": "object",
++          "description": "System and/or distro specific settings. This is not intended to be overridden by user data or vendor data.",
++          "deprecated": true,
++          "deprecated_version": "24.2"
+         }
+       }
+     },
+@@ -3905,6 +3911,7 @@
+     "ssh_pwauth": {},
+     "ssh_quiet_keygen": {},
+     "swap": {},
++    "system_info": {},
+     "timezone": {},
+     "ubuntu_advantage": {},
+     "updates": {},
+diff --git a/doc/examples/cloud-config-apt.txt b/doc/examples/cloud-config-apt.txt
+index dd6a0f6a..04968035 100644
+--- a/doc/examples/cloud-config-apt.txt
++++ b/doc/examples/cloud-config-apt.txt
+@@ -8,29 +8,6 @@
+ #   Number: Set pipelining to some number (not recommended)
+ apt_pipelining: False
+ 
+-## apt config via system_info:
+-# under the 'system_info', you can customize cloud-init's interaction
+-# with apt.
+-#  system_info:
+-#    apt_get_command: [command, argument, argument]
+-#    apt_get_upgrade_subcommand: dist-upgrade
+-#
+-# apt_get_command:
+-#  To specify a different 'apt-get' command, set 'apt_get_command'.
+-#  This must be a list, and the subcommand (update, upgrade) is appended to it.
+-#  default is:
+-#    ['apt-get', '--option=Dpkg::Options::=--force-confold',
+-#     '--option=Dpkg::options::=--force-unsafe-io', '--assume-yes', '--quiet']
+-#
+-# apt_get_upgrade_subcommand: "dist-upgrade"
+-#  Specify a different subcommand for 'upgrade. The default is 'dist-upgrade'.
+-#  This is the subcommand that is invoked for package_upgrade.
+-#
+-# apt_get_wrapper:
+-#   command: eatmydata
+-#   enabled: [True, False, "auto"]
+-#
+-
+ # Install additional packages on first boot
+ #
+ # Default: none
+diff --git a/doc/examples/cloud-config-user-groups.txt b/doc/examples/cloud-config-user-groups.txt
+index 56eb674f..2cafef88 100644
+--- a/doc/examples/cloud-config-user-groups.txt
++++ b/doc/examples/cloud-config-user-groups.txt
+@@ -143,13 +143,5 @@ users:
+ #
+ # users[0] (the first user in users) overrides the user directive.
+ #
+-# The 'default' user above references the distro's config:
+-# system_info:
+-#   default_user:
+-#     name: Ubuntu
+-#     plain_text_passwd: 'ubuntu'
+-#     home: /home/ubuntu
+-#     shell: /bin/bash
+-#     lock_passwd: True
+-#     gecos: Ubuntu
+-#     groups: [adm, cdrom, dip, lxd, sudo]
++# The 'default' user above references the distro's config set in
++# /etc/cloud/cloud.cfg.
+diff --git a/tests/data/user_data.1.txt b/tests/data/user_data.1.txt
+index 4c4543de..a1b5aa60 100644
+--- a/tests/data/user_data.1.txt
++++ b/tests/data/user_data.1.txt
+@@ -3,13 +3,3 @@ write_files:
+ -   content: blah
+     path: /etc/blah.ini
+     permissions: 493
+-
+-system_info:
+- package_mirrors:
+-   - arches: [i386, amd64, blah]
+-     failsafe:
+-      primary: http://my.archive.mydomain.com/ubuntu
+-      security: http://my.security.mydomain.com/ubuntu
+-     search:
+-      primary: []
+-      security: []
+diff --git a/tests/unittests/runs/test_merge_run.py b/tests/unittests/runs/test_merge_run.py
+index afc256ec..251c5ae5 100644
+--- a/tests/unittests/runs/test_merge_run.py
++++ b/tests/unittests/runs/test_merge_run.py
+@@ -22,7 +22,21 @@ class TestMergeRun(helpers.FilesystemMockingTestCase):
+         cfg = {
+             "datasource_list": ["None"],
+             "cloud_init_modules": ["write_files"],
+-            "system_info": {"paths": {"run_dir": new_root}},
++            "system_info": {
++                "paths": {"run_dir": new_root},
++                "package_mirrors": [
++                    {
++                        "arches": ["i386", "amd64", "blah"],
++                        "failsafe": {
++                            "primary": "http://my.archive.mydomain.com/ubuntu",
++                            "security": (
++                                "http://my.security.mydomain.com/ubuntu"
++                            ),
++                        },
++                        "search": {"primary": [], "security": []},
++                    },
++                ],
++            },
+         }
+         ud = helpers.readResource("user_data.1.txt")
+         cloud_cfg = safeyaml.dumps(cfg)
+-- 
+2.39.3
+

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

@@ -1,15 +1,15 @@
-From 1024e43b58ce84bb6c6d8bd89785704e04560b2a Mon Sep 17 00:00:00 2001
+From c21351ad9da5aebcb252aa36cbfa92ac16fa9746 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-MergeRequest: 72: Fixes for cloud-init fails to configure DNS/search domains for network-config v1
+RH-Jira: RHEL-20964
 RH-Acked-by: Ani Sinha <anisinha@redhat.com>
 RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-RH-Commit: [2/2] 73d27116735e853fbaa38942390721dd78bc6241
+RH-Commit: [2/2] 1d2b10133ec2558e9665f21f53e4b1a898e283a8 (cavery/cloud-init-c-9-s)
 
 Sometimes DNS settings in cloud configs are specified globally and
 not per interface / subnet. This results in a configuration without
@@ -128,10 +128,10 @@ index 06feab89..f340ffc1 100644
      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
+index 2a99f150..d7c9a414 100644
 --- a/tests/unittests/test_net.py
 +++ b/tests/unittests/test_net.py
-@@ -645,6 +645,7 @@ method=manual
+@@ -646,6 +646,7 @@ method=manual
  may-fail=false
  address1=172.19.1.34/22
  route1=0.0.0.0/0,172.19.3.254
@@ -139,7 +139,7 @@ index 678ec39b..e010eb6b 100644
  
  """.lstrip(),
              ),
-@@ -2769,6 +2770,8 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+@@ -2797,6 +2798,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
@@ -148,7 +148,7 @@ index 678ec39b..e010eb6b 100644
  
                  """
              ),
-@@ -2794,6 +2797,8 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+@@ -2822,6 +2825,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
@@ -157,7 +157,7 @@ index 678ec39b..e010eb6b 100644
  
                  """
              ),
-@@ -2818,6 +2823,8 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+@@ -2846,6 +2851,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
@@ -166,7 +166,7 @@ index 678ec39b..e010eb6b 100644
  
                  """
              ),
-@@ -2902,12 +2909,15 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+@@ -2930,12 +2937,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
@@ -182,7 +182,7 @@ index 678ec39b..e010eb6b 100644
  
                  """
              ),
-@@ -2962,6 +2972,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+@@ -2990,6 +3000,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
@@ -203,5 +203,5 @@ index dbdb9cfa..f4da0989 100644
  bdrung
  beantaxi
 -- 
-2.41.0
+2.39.3
 

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

@@ -1,15 +1,15 @@
-From 773501c6d2b52a5623b5fed3c5534d41aa6488fa Mon Sep 17 00:00:00 2001
+From 6b32b371bfd37759ddce3d7f29d15546500698e6 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)
+Subject: [PATCH 1/6] 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-Author: Ani Sinha <anisinha@redhat.com>
+RH-MergeRequest: 88: feat(sysconfig): Add DNS from interface config to resolv.conf (#5401)
+RH-Jira: RHEL-17961
 RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-RH-Commit: [1/1] b9f492627cdae3bf356f388eb0870241793a7f99
+RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
+RH-Commit: [1/1] f353b73cc0f4bb9e1aee037708a1d3cb23b83cc3 (anisinha/cloud-init)
 
 sysconfig renderer currently only uses global dns and search domain
 configuration in order to populate /etc/resolv.conf. This means it ignores
@@ -25,14 +25,14 @@ 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(-)
+ tests/unittests/test_net.py | 184 +++++++++++++++++++++++++++++++++++-
+ 2 files changed, 230 insertions(+), 6 deletions(-)
 
 diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
-index f01c4236..42eb2be3 100644
+index d39f4fe3..7eb430ed 100644
 --- a/cloudinit/net/sysconfig.py
 +++ b/cloudinit/net/sysconfig.py
-@@ -824,20 +824,62 @@ class Renderer(renderer.Renderer):
+@@ -825,20 +825,62 @@ class Renderer(renderer.Renderer):
  
      @staticmethod
      def _render_dns(network_state, existing_dns_path=None):
@@ -101,7 +101,7 @@ index f01c4236..42eb2be3 100644
          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
+index d7c9a414..2d716f4b 100644
 --- a/tests/unittests/test_net.py
 +++ b/tests/unittests/test_net.py
 @@ -516,6 +516,8 @@ OS_SAMPLES = [
@@ -123,7 +123,7 @@ index e010eb6b..86ba398d 100644
  """.lstrip(),
              ),
              (
-@@ -581,6 +585,8 @@ dns = none
+@@ -582,6 +586,8 @@ AUTOCONNECT_PRIORITY=120
  BOOTPROTO=none
  DEFROUTE=yes
  DEVICE=eth0
@@ -132,7 +132,7 @@ index e010eb6b..86ba398d 100644
  GATEWAY=172.19.3.254
  HWADDR=fa:16:3e:ed:9a:59
  IPADDR=172.19.1.34
-@@ -595,7 +601,173 @@ USERCTL=no
+@@ -596,7 +602,174 @@ USERCTL=no
                  """
  ; Created by cloud-init automatically, do not edit.
  ;
@@ -282,6 +282,7 @@ index e010eb6b..86ba398d 100644
 +                """
 +# Created by cloud-init automatically, do not edit.
 +#
++AUTOCONNECT_PRIORITY=120
 +BOOTPROTO=none
 +DEFROUTE=yes
 +DEVICE=eth0
@@ -306,7 +307,7 @@ index e010eb6b..86ba398d 100644
  """.lstrip(),
              ),
              (
-@@ -646,6 +818,7 @@ may-fail=false
+@@ -647,6 +820,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;
@@ -314,7 +315,7 @@ index e010eb6b..86ba398d 100644
  
  """.lstrip(),
              ),
-@@ -653,7 +826,13 @@ dns=172.19.0.12;
+@@ -654,7 +828,13 @@ dns=172.19.0.12;
      },
      {
          "in_data": {
@@ -329,7 +330,7 @@ index e010eb6b..86ba398d 100644
              "networks": [
                  {
                      "network_id": "public-ipv4",
-@@ -714,6 +893,7 @@ STARTMODE=auto
+@@ -715,6 +895,7 @@ STARTMODE=auto
  ; Created by cloud-init automatically, do not edit.
  ;
  nameserver 172.19.0.12
@@ -337,7 +338,7 @@ index e010eb6b..86ba398d 100644
  """.lstrip(),
              ),
              (
-@@ -761,6 +941,7 @@ USERCTL=no
+@@ -763,6 +944,7 @@ USERCTL=no
  ; Created by cloud-init automatically, do not edit.
  ;
  nameserver 172.19.0.12
@@ -346,5 +347,5 @@ index e010eb6b..86ba398d 100644
              ),
              (
 -- 
-2.45.1
+2.39.3
 

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

@@ -1,14 +1,14 @@
-From b424877c0e7673466e7bd354c1eed4db908ebab3 Mon Sep 17 00:00:00 2001
+From 6a61ce0f0cde11551bfe92835d0b33c7b1022b68 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-MergeRequest: 109: fix: Add subnet ipv4/ipv6  to network schema (#5191)
+RH-Jira: RHEL-54686
 RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
 RH-Acked-by: Cathy Avery <cavery@redhat.com>
-RH-Commit: [1/1] d4c7beb80b8c67df6b6fc04db8d3b93ed82dd067
+RH-Commit: [1/1] 83692fac8f9af1831970091bdf7c43d0e59f314c (anisinha/cloud-init)
 
 These are used by our openstack network_data.json parsing code and
 get used by the sysconfig renderer.
@@ -41,5 +41,5 @@ index 64c492a4..f485c784 100644
        }
      },
 -- 
-2.45.1
+2.39.3
 

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

@@ -1,17 +1,17 @@
-From 720faf533832ba758dcc8436f144168996508c2a Mon Sep 17 00:00:00 2001
+From 2f7f3dc6237ea70825dcb70f71d9718f631a9d95 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)
+Subject: [PATCH] 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-MergeRequest: 69: fix: Add types to network v1 schema (#4841)
+RH-Jira: RHEL-21324
 RH-Acked-by: Ani Sinha <None>
 RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-RH-Commit: [2/2] a73a68dff5a6ef54dc4e3b3527fc778400a461cc
+RH-Commit: [1/1] 59b2b4b07dd9eed956943a22b90af487f18b4cbd (cavery/cloud-init-c-9-s)
 
 Conflicts:
-For RHEL no log argument as we are not including commit e168b4a1383b6eae9c1dc81411d7684fcbbf7df9
+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

SOURCES/ci-fix-Address-TIOBE-abstract-interpretation-issues-486.patch

@@ -0,0 +1,73 @@
+From 8ead44cb39f7726a695aa21a34820f6d40270829 Mon Sep 17 00:00:00 2001
+From: James Falcon <james.falcon@canonical.com>
+Date: Mon, 12 Feb 2024 14:48:01 -0600
+Subject: [PATCH 5/6] fix: Address TIOBE abstract interpretation issues (#4866)
+
+RH-Author: Ani Sinha <anisinha@redhat.com>
+RH-MergeRequest: 92: Update pylint version to support python 3.12
+RH-Jira: RHEL-44598
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
+RH-Commit: [2/3] 3ca11206fa159ab45b2db21e78c4cfaf358b1e01 (anisinha/cloud-init)
+
+These involve operations on possibly null variables or impossible logic.
+
+(cherry picked from commit 5e7ef1032a12267a9a518358fbf89da0a88ddb99)
+---
+ cloudinit/config/cc_lxd.py            | 2 +-
+ cloudinit/distros/parsers/ifconfig.py | 6 ++++++
+ cloudinit/util.py                     | 1 +
+ 3 files changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/cloudinit/config/cc_lxd.py b/cloudinit/config/cc_lxd.py
+index cb9fc4f3..9f267b4c 100644
+--- a/cloudinit/config/cc_lxd.py
++++ b/cloudinit/config/cc_lxd.py
+@@ -432,7 +432,7 @@ def bridge_to_cmd(bridge_cfg):
+             % (bridge_cfg.get("ipv6_address"), bridge_cfg.get("ipv6_netmask"))
+         )
+ 
+-        if bridge_cfg.get("ipv6_nat", "false") == "true":
++        if bridge_cfg.get("ipv6_nat") == "true":
+             cmd_create.append("ipv6.nat=true")
+ 
+     else:
+diff --git a/cloudinit/distros/parsers/ifconfig.py b/cloudinit/distros/parsers/ifconfig.py
+index 516b5eb5..d671df1f 100644
+--- a/cloudinit/distros/parsers/ifconfig.py
++++ b/cloudinit/distros/parsers/ifconfig.py
+@@ -102,6 +102,7 @@ class Ifconfig:
+         """
+         ifindex = 0
+         ifs_by_mac = defaultdict(list)
++        dev = None
+         for line in text.splitlines():
+             if len(line) == 0:
+                 continue
+@@ -119,6 +120,11 @@ class Ifconfig:
+                 dev.index = ifindex
+                 self._ifs_by_name[curif] = dev
+ 
++            if not dev:
++                # This shouldn't happen with normal ifconfig output, but
++                # if it does, ensure we don't Traceback
++                continue
++
+             toks = line.lower().strip().split()
+ 
+             if len(toks) > 1 and toks[1].startswith("flags="):
+diff --git a/cloudinit/util.py b/cloudinit/util.py
+index 3295735c..5f787c5c 100644
+--- a/cloudinit/util.py
++++ b/cloudinit/util.py
+@@ -1417,6 +1417,7 @@ def find_devs_with_netbsd(
+     devlist = []
+     label = None
+     _type = None
++    mscdlabel_out = ""
+     if criteria:
+         if criteria.startswith("LABEL="):
+             label = criteria.lstrip("LABEL=")
+-- 
+2.39.3
+

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

@@ -1,14 +1,14 @@
-From 4e5b1ed68014b81ca2ef2f07675f2a43cf03c5c3 Mon Sep 17 00:00:00 2001
+From 62cec1e38e117fe6b24888862576ac57be14bbda 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-MergeRequest: 82: fix: Always use single datasource if specified (#5098)
+RH-Jira: RHEL-36255
 RH-Acked-by: Cathy Avery <cavery@redhat.com>
-RH-Commit: [1/1] 491f053f7d758f1a0ca8918d1449cc2f7838291f
+RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
+RH-Commit: [1/1] 068e97fcc18dd99f1112a9109acdb30fe2880f6e (anisinha/cloud-init)
 
 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
@@ -62,5 +62,5 @@ index ec2cc18a..6e49ded3 100755
      fi
  
 -- 
-2.45.1
+2.39.3
 

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

@@ -1,14 +1,13 @@
-From cfbe83d4a869ab20d385b5058031df0364483bda Mon Sep 17 00:00:00 2001
+From 914ac26ebd889b1f5cbb13d55fc011e92fc213c6 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)
+Subject: [PATCH 1/2] 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-MergeRequest: 103: fix: Clean cache if no datasource fallback (#5499)
+RH-Jira: RHEL-49736
 RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-RH-Commit: [1/1] 64a79c1a6bd06c280aed85032bb55cc60ec1fc2e
+RH-Commit: [1/1] 37eacd97f5e60fae2f71d401c528d508d3db517e (anisinha/cloud-init)
 
 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

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

@@ -1,14 +1,14 @@
-From 65207b6778fa97ff450a9200c28e4770c9128854 Mon Sep 17 00:00:00 2001
+From aaf1d063f198ce09f0d539a85e1a1a2bb834520b 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-MergeRequest: 72: Fixes for cloud-init fails to configure DNS/search domains for network-config v1
+RH-Jira: RHEL-20964
 RH-Acked-by: Ani Sinha <anisinha@redhat.com>
 RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-RH-Commit: [1/2] abfebdde6b8b914d5a7de8853beca1fe206a5b23
+RH-Commit: [1/2] fb865987dbcf506a674eb9798f9c06859539a696 (cavery/cloud-init-c-9-s)
 
 fix: Correct v2 NetworkManager route rendering
 
@@ -195,10 +195,10 @@ index 76a0ac15..bd6e6d75 100644
          # 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
+index d9ef493b..2a99f150 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
+@@ -2962,9 +2962,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
@@ -209,7 +209,7 @@ index e52c2497..678ec39b 100644
  
                  """
              ),
-@@ -4114,6 +4114,148 @@ iface bond0 inet6 static
+@@ -4154,6 +4154,148 @@ iface bond0 inet6 static
              """
          ),
      },
@@ -358,7 +358,7 @@ index e52c2497..678ec39b 100644
  }
  
  
-@@ -6214,6 +6356,27 @@ class TestNetworkManagerRendering(CiTestCase):
+@@ -6267,6 +6409,27 @@ class TestNetworkManagerRendering(CiTestCase):
              entry[self.expected_name], self.expected_conf_d, found
          )
  
@@ -387,5 +387,5 @@ index e52c2497..678ec39b 100644
  @mock.patch(
      "cloudinit.net.is_openvswitch_internal_interface",
 -- 
-2.41.0
+2.39.3
 

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

@@ -1,15 +1,15 @@
-From d17e05b1709e3b7148e889512282603f7399c857 Mon Sep 17 00:00:00 2001
+From cf35040b46abb66c7239d156bd92c7267d7c40f7 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-MergeRequest: 75: fix: Fall back to cached local ds if no valid ds found (#4997)
+RH-Jira: RHEL-32846
 RH-Acked-by: Cathy Avery <cavery@redhat.com>
 RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [1/1] df9c6fda66dee9622725ff2d52e64999796324b8
+RH-Commit: [1/1] 408c41fd8009255d98c31210ef936f2e68dfde75 (anisinha/cloud-init)
 
 Rebooting an instance which has finished VMware guest
 customization with DataSourceVMware will load

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

@@ -1,15 +1,15 @@
-From 8a83f1e6077cea9dc9ebc909e1332e15c8cbadac Mon Sep 17 00:00:00 2001
+From 332bb23bcfde801edf792e6c629ec350be07b952 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-MergeRequest: 73: fix: Undeprecate 'network' in schema route definition (#5072)
+RH-Jira: RHEL-29709
 RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
 RH-Acked-by: Cathy Avery <cavery@redhat.com>
-RH-Commit: [1/1] c482c3e11720f01daa7b0d37035157b062b35213
+RH-Commit: [1/1] 61c660be43fd25999bca0cfd66d7b2150fee5a14 (anisinha/cloud-init)
 
 It is passed through to our v1 schema from OpenStack network_data.json
 
@@ -38,5 +38,5 @@ index 56dc27c9..64c492a4 100644
          "destination": {
            "type": "string",
 -- 
-2.41.0
+2.39.3
 

SOURCES/ci-fix-add-schema-rules-for-baseurl-and-metalink-in-yum.patch

@@ -0,0 +1,66 @@
+From ed3c05af60c0d50a4576a63c8638e148e58ebf06 Mon Sep 17 00:00:00 2001
+From: Ani Sinha <anisinha@redhat.com>
+Date: Thu, 11 Jul 2024 00:49:58 +0530
+Subject: [PATCH] fix: add schema rules for 'baseurl' and 'metalink' in yum
+ repo config (#5501)
+
+RH-Author: Ani Sinha <anisinha@redhat.com>
+RH-MergeRequest: 101: fix: add schema rules for 'baseurl' and 'metalink' in yum repo config (#5501)
+RH-Jira: RHEL-46873
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Acked-by: xiachen <xiachen@redhat.com>
+RH-Commit: [1/1] df01c93fde517e66ce71a66f80ee54d3ed504906 (anisinha/cloud-init)
+
+At least one of (or both) 'baseurl' or 'metalink' should be provided for yum
+repository specification. Add schema changes to enforce it. Without this,
+with just 'metalink' property set, one would get the schema validator error
+
+\---
+Error: Cloud config schema errors: yum_repos.epel-release: 'baseurl' is a required property
+\---
+
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+(cherry picked from commit 7d35664ef8b85840f92f18cc48187f7284d227bc)
+---
+ .../config/schemas/schema-cloud-config-v1.json | 18 ++++++++++++++++--
+ 1 file changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/cloudinit/config/schemas/schema-cloud-config-v1.json b/cloudinit/config/schemas/schema-cloud-config-v1.json
+index 03e723e2..4fb7fd93 100644
+--- a/cloudinit/config/schemas/schema-cloud-config-v1.json
++++ b/cloudinit/config/schemas/schema-cloud-config-v1.json
+@@ -3442,6 +3442,11 @@
+                   "format": "uri",
+                   "description": "URL to the directory where the yum repository's 'repodata' directory lives"
+                 },
++                "metalink": {
++                  "type": "string",
++                  "format": "uri",
++                  "description": "Specifies a URL to a metalink file for the repomd.xml"
++                },
+                 "name": {
+                   "type": "string",
+                   "description": "Optional human-readable name of the yum repo."
+@@ -3469,8 +3474,17 @@
+                   "description": "Any supported yum repository configuration options will be written to the yum repo config file. See: man yum.conf"
+                 }
+               },
+-              "required": [
+-                "baseurl"
++              "anyOf": [
++                {
++                  "required": [
++                    "baseurl"
++                  ]
++                },
++                {
++                  "required": [
++                    "metalink"
++                  ]
++                }
+               ]
+             }
+           }
+-- 
+2.39.3
+

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

@@ -1,15 +1,15 @@
-From 6e3c351b013dc2ac01035853229ffdfdafa3afa8 Mon Sep 17 00:00:00 2001
+From fcaff2e02a07af587d8366f61df1685435e32288 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-MergeRequest: 85: fix(cloudstack): Use parsed lease file for virtual router in cloudstack
+RH-Jira: RHEL-40217
 RH-Acked-by: Cathy Avery <cavery@redhat.com>
-RH-Acked-by: Jon Maloy <jmaloy@redhat.com>
-RH-Commit: [1/1] 77f97c04432fffff125dc1725d66b33ae0ab4af8
+RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
+RH-Commit: [1/1] 9d1353620ee2c773170e424479bb2664116554f4 (anisinha/cloud-init)
 
 Fixes 5942f4023e2581a
 

SOURCES/ci-fix-dhcp-Guard-against-FileNotFoundError-and-NameErr.patch

@@ -0,0 +1,132 @@
+From 2b74b0eb94edfd7caa42bc0d8affc37311ba041b Mon Sep 17 00:00:00 2001
+From: Brett Holman <brett.holman@canonical.com>
+Date: Wed, 3 Jan 2024 09:11:21 -0700
+Subject: [PATCH 4/6] fix(dhcp): Guard against FileNotFoundError and NameError
+ exceptions
+
+RH-Author: Ani Sinha <anisinha@redhat.com>
+RH-MergeRequest: 92: Update pylint version to support python 3.12
+RH-Jira: RHEL-44598
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
+RH-Commit: [1/3] 730b8de9ceb2c380d3b15573d83691ab95a1487e (anisinha/cloud-init)
+
+(cherry picked from commit 53eb8555e091474803b724700815adc09aa84f05)
+---
+ cloudinit/net/dhcp.py            | 20 ++++++++++------
+ tests/unittests/net/test_dhcp.py | 40 ++++++++++++++++++++++++++++++++
+ 2 files changed, 53 insertions(+), 7 deletions(-)
+
+diff --git a/cloudinit/net/dhcp.py b/cloudinit/net/dhcp.py
+index 07c13390..a0aee98c 100644
+--- a/cloudinit/net/dhcp.py
++++ b/cloudinit/net/dhcp.py
+@@ -5,15 +5,15 @@
+ # This file is part of cloud-init. See LICENSE file for license information.
+ 
+ import abc
+-import contextlib
+ import glob
+ import logging
+ import os
+ import re
+ import signal
+ import time
++from contextlib import suppress
+ from io import StringIO
+-from typing import Any, Dict, List
++from typing import Any, Dict, List, Optional
+ 
+ import configobj
+ 
+@@ -268,7 +268,7 @@ class IscDhclient(DhcpClient):
+ 
+         # this function waits for these files to exist, clean previous runs
+         # to avoid false positive in wait_for_files
+-        with contextlib.suppress(FileNotFoundError):
++        with suppress(FileNotFoundError):
+             os.remove(pid_file)
+             os.remove(lease_file)
+ 
+@@ -514,9 +514,15 @@ class IscDhclient(DhcpClient):
+         return latest_file
+ 
+     @staticmethod
+-    def parse_dhcp_server_from_lease_file(lease_file):
+-        with open(lease_file, "r") as fd:
+-            for line in fd:
++    def parse_dhcp_server_from_lease_file(lease_file) -> Optional[str]:
++        """Parse a lease file for the dhcp server address
++
++        @param lease_file: Name of a file to be parsed
++        @return: An address if found, or None
++        """
++        latest_address = None
++        with suppress(FileNotFoundError), open(lease_file, "r") as file:
++            for line in file:
+                 if "dhcp-server-identifier" in line:
+                     words = line.strip(" ;\r\n").split(" ")
+                     if len(words) > 2:
+@@ -561,7 +567,7 @@ class Udhcpc(DhcpClient):
+ 
+         tmp_dir = temp_utils.get_tmp_ancestor(needs_exe=True)
+         lease_file = os.path.join(tmp_dir, interface + ".lease.json")
+-        with contextlib.suppress(FileNotFoundError):
++        with suppress(FileNotFoundError):
+             os.remove(lease_file)
+ 
+         # udhcpc needs the interface up to send initial discovery packets
+diff --git a/tests/unittests/net/test_dhcp.py b/tests/unittests/net/test_dhcp.py
+index a7b62312..8ec96eef 100644
+--- a/tests/unittests/net/test_dhcp.py
++++ b/tests/unittests/net/test_dhcp.py
+@@ -32,6 +32,46 @@ LEASE_F = "/run/dhclient.lease"
+ DHCLIENT = "/sbin/dhclient"
+ 
+ 
++@pytest.mark.parametrize(
++    "server_address,lease_file_content",
++    (
++        pytest.param(None, None, id="no_server_addr_on_absent_lease_file"),
++        pytest.param(None, "", id="no_server_addr_on_empty_lease_file"),
++        pytest.param(
++            None,
++            "lease {\n  fixed-address: 10.1.2.3;\n}\n",
++            id="no_server_addr_when_no_server_ident",
++        ),
++        pytest.param(
++            "10.4.5.6",
++            "lease {\n fixed-address: 10.1.2.3;\n"
++            "  option dhcp-server-identifier 10.4.5.6;\n"
++            "  option dhcp-renewal-time 1800;\n}\n",
++            id="server_addr_found_when_server_ident_present",
++        ),
++    ),
++)
++class TestParseDHCPServerFromLeaseFile:
++    def test_find_server_address_when_present(
++        self, server_address, lease_file_content, tmp_path
++    ):
++        """Test that we return None in the case of no file or file contains no
++        server address, otherwise return the address.
++        """
++        lease_file = tmp_path / "dhcp.leases"
++        if server_address:
++            if lease_file_content:
++                lease_file.write_text(lease_file_content)
++            assert (
++                server_address
++                == IscDhclient.parse_dhcp_server_from_lease_file(lease_file)
++            )
++        else:
++            assert not IscDhclient.parse_dhcp_server_from_lease_file(
++                lease_file
++            )
++
++
+ class TestParseDHCPLeasesFile(CiTestCase):
+     def test_parse_empty_lease_file_errors(self):
+         """parse_dhcp_lease_file errors when file content is empty."""
+-- 
+2.39.3
+

SOURCES/ci-fix-jsonschema-Add-missing-sudo-definition-5418.patch

@@ -0,0 +1,53 @@
+From b7fddab36d805099639358736dab474d2924906b Mon Sep 17 00:00:00 2001
+From: Brett Holman <brett.holman@canonical.com>
+Date: Wed, 19 Jun 2024 17:07:56 -0600
+Subject: [PATCH 2/6] fix(jsonschema): Add missing sudo definition (#5418)
+
+RH-Author: Ani Sinha <anisinha@redhat.com>
+RH-MergeRequest: 90: fix(jsonschema): Add missing sudo definition (#5418)
+RH-Jira: RHEL-44337
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
+RH-Commit: [1/2] 9e56c7ab35744c6530c8cef2f122ffdcc0480d29 (anisinha/cloud-init)
+
+This configuration:
+
+```
+users:
+  - name: osadmin
+    lock_passwd: false
+    sudo: ["ALL=(ALL) NOPASSWD:ALL"]
+```
+
+Is valid syntax but is missing from the jsonschema definition.
+
+Fixes GH-5399
+
+(cherry picked from commit b533fa51acb850ed754e2b1925e276ff8e5f3507)
+---
+ cloudinit/config/schemas/schema-cloud-config-v1.json | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/cloudinit/config/schemas/schema-cloud-config-v1.json b/cloudinit/config/schemas/schema-cloud-config-v1.json
+index a553c52c..8b10fe70 100644
+--- a/cloudinit/config/schemas/schema-cloud-config-v1.json
++++ b/cloudinit/config/schemas/schema-cloud-config-v1.json
+@@ -299,6 +299,15 @@
+               ],
+               "description": "Sudo rule to use or false. Absence of a sudo value or ``null`` will result in no sudo rules added for this user."
+             },
++            {
++              "type": "array",
++              "items": {
++                "type": [
++                  "string",
++                  "null"
++                ]
++              }
++            },
+             {
+               "type": "boolean",
+               "changed": true,
+-- 
+2.39.3
+

SOURCES/ci-fix-schema-permit-deprecated-hyphenated-keys-under-u.patch

@@ -0,0 +1,412 @@
+From ce69cd178d9c05827db1ca1654de82dc3f9f521e Mon Sep 17 00:00:00 2001
+From: Chad Smith <chad.smith@canonical.com>
+Date: Thu, 27 Jun 2024 18:12:31 -0600
+Subject: [PATCH 3/3] fix(schema): permit deprecated hyphenated keys under
+ users key (#5456)
+
+RH-Author: Ani Sinha <anisinha@redhat.com>
+RH-MergeRequest: 95: Deprecate the users ssh-authorized-keys property (#5162)
+RH-Jira: RHEL-45262
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
+RH-Commit: [3/3] 76804599a9166796dc52bab2031a706993ad2e3c (anisinha/cloud-init)
+
+Both hyphenated and underscore delimited key names are permitted
+by cloudinit/distros/ug_util.py#L114 due to magic replacement
+of key names.
+
+Since this is still valid json schema, add the necessary hyphenated
+aliases for all users/groups keys. Because the goal in the future is
+to only support one config key for a given configuraion option, add
+deprecated keys to those schema definitions.
+
+Also drop the description key from the deprecates lock-passwd schema
+key.
+
+Any deprecated schema key which provides a suggested replacement should
+not provide duplicated key descriptions as the preferred replacement
+will provided the necessary context.
+
+Fixes GH-5454
+
+(cherry picked from commit b3618d44a37ae6345f0c3d935b77ae0ae9dd1c92)
+---
+ .../schemas/schema-cloud-config-v1.json       | 103 +++++++++++++-----
+ tests/unittests/config/test_cc_grub_dpkg.py   |   4 +-
+ .../test_cc_package_update_upgrade_install.py |  11 +-
+ .../unittests/config/test_cc_users_groups.py  |  33 +++---
+ tests/unittests/config/test_schema.py         |  15 ++-
+ 5 files changed, 108 insertions(+), 58 deletions(-)
+
+diff --git a/cloudinit/config/schemas/schema-cloud-config-v1.json b/cloudinit/config/schemas/schema-cloud-config-v1.json
+index 97cf2b74..03e723e2 100644
+--- a/cloudinit/config/schemas/schema-cloud-config-v1.json
++++ b/cloudinit/config/schemas/schema-cloud-config-v1.json
+@@ -178,9 +178,9 @@
+               "patternProperties": {
+                 "^.+$": {
+                   "label": "<group_name>",
+-                  "description": "When providing an object for users.groups the ``<group_name>`` keys are the groups to add this user to",
+                   "deprecated": true,
+                   "deprecated_version": "23.1",
++                  "deprecated_description": "The use of ``object`` type is deprecated. Use ``string`` or ``array`` of ``string`` instead.",
+                   "type": [
+                     "null"
+                   ],
+@@ -203,9 +203,7 @@
+           "type": "string"
+         },
+         "lock-passwd": {
+-          "default": true,
+           "type": "boolean",
+-          "description": "Default: ``true``",
+           "deprecated": true,
+           "deprecated_version": "22.3",
+           "deprecated_description": "Use ``lock_passwd`` instead."
+@@ -215,16 +213,34 @@
+           "description": "Disable password login. Default: ``true``",
+           "type": "boolean"
+         },
++        "no-create-home": {
++          "type": "boolean",
++          "deprecated": true,
++          "deprecated_version": "24.2",
++          "deprecated_description": "Use ``no_create_home`` instead."
++        },
+         "no_create_home": {
+           "default": false,
+           "description": "Do not create home directory. Default: ``false``",
+           "type": "boolean"
+         },
++        "no-log-init": {
++          "type": "boolean",
++          "deprecated": true,
++          "deprecated_version": "24.2",
++          "deprecated_description": "Use ``no_log_init`` instead."
++        },
+         "no_log_init": {
+           "default": false,
+           "description": "Do not initialize lastlog and faillog for user. Default: ``false``",
+           "type": "boolean"
+         },
++        "no-user-group": {
++          "type": "boolean",
++          "deprecated": true,
++          "deprecated_version": "24.2",
++          "deprecated_description": "Use ``no_user_group`` instead."
++        },
+         "no_user_group": {
+           "default": false,
+           "description": "Do not create group named after user. Default: ``false``",
+@@ -234,24 +250,54 @@
+           "description": "Hash of user password applied when user does not exist. This will NOT be applied if the user already exists. To generate this hash, run: mkpasswd --method=SHA-512 --rounds=4096. **Note:** While hashed password is better than plain text, using ``passwd`` in user-data represents a security risk as user-data could be accessible by third-parties depending on your cloud platform.",
+           "type": "string"
+         },
++        "hashed-passwd": {
++          "type": "string",
++          "deprecated": true,
++          "deprecated_version": "24.2",
++          "deprecated_description": "Use ``hashed_passwd`` instead."
++        },
+         "hashed_passwd": {
+           "description": "Hash of user password to be applied. This will be applied even if the user is pre-existing. To generate this hash, run: mkpasswd --method=SHA-512 --rounds=4096. **Note:** While ``hashed_password`` is better than ``plain_text_passwd``, using ``passwd`` in user-data represents a security risk as user-data could be accessible by third-parties depending on your cloud platform.",
+           "type": "string"
+         },
++        "plain-text-passwd": {
++          "type": "string",
++          "deprecated": true,
++          "deprecated_version": "24.2",
++          "deprecated_description": "Use ``plain_text_passwd`` instead."
++        },
+         "plain_text_passwd": {
+           "description": "Clear text of user password to be applied. This will be applied even if the user is pre-existing. There are many more secure options than using plain text passwords, such as ``ssh_import_id`` or ``hashed_passwd``. Do not use this in production as user-data and your password can be exposed.",
+           "type": "string"
+         },
++        "create-groups": {
++          "type": "boolean",
++          "deprecated": true,
++          "deprecated_version": "24.2",
++          "deprecated_description": "Use ``create_groups`` instead."
++        },
+         "create_groups": {
+           "default": true,
+           "description": "Boolean set ``false`` to disable creation of specified user ``groups``. Default: ``true``.",
+           "type": "boolean"
+         },
++        "primary-group": {
++          "type": "string",
++          "deprecated": true,
++          "deprecated_version": "24.2",
++          "deprecated_description": "Use ``primary_group`` instead."
++        },
+         "primary_group": {
+           "default": "``<username>``",
+           "description": "Primary group for user. Default: ``<username>``",
+           "type": "string"
+         },
++        "selinux-user": {
++          "type": "string",
++          "deprecated": true,
++          "deprecated_version": "24.2",
++          "deprecated_description": "Use ``selinux_user`` instead."
++        },
+         "selinux_user": {
+           "description": "SELinux user for user's login. Default to default SELinux user.",
+           "type": "string"
+@@ -273,20 +319,24 @@
+           "minItems": 1
+         },
+         "ssh-authorized-keys": {
+-          "allOf": [
+-            {
+-              "type": "array",
+-              "items": {
+-                "type": "string"
+-              },
+-              "minItems": 1
+-            },
+-            {
+-              "deprecated": true,
+-              "deprecated_version": "18.3",
+-              "deprecated_description": "Use ``ssh_authorized_keys`` instead."
+-            }
+-          ]
++          "type": "array",
++          "items": {
++            "type": "string"
++          },
++          "minItems": 1,
++          "deprecated": true,
++          "deprecated_version": "18.3",
++          "deprecated_description": "Use ``ssh_authorized_keys`` instead."
++        },
++        "ssh-import-id": {
++          "type": "array",
++          "items": {
++            "type": "string"
++          },
++          "minItems": 1,
++          "deprecated": true,
++          "deprecated_version": "24.2",
++          "deprecated_description": "Use ``ssh_import_id`` instead."
+         },
+         "ssh_import_id": {
+           "description": "List of SSH IDs to import for user. Can not be combined with ``ssh_redirect_user``.",
+@@ -296,6 +346,12 @@
+           },
+           "minItems": 1
+         },
++        "ssh-redirect-user": {
++          "type": "boolean",
++          "deprecated": true,
++          "deprecated_version": "24.2",
++          "deprecated_description": "Use ``ssh_redirect_user`` instead."
++        },
+         "ssh_redirect_user": {
+           "type": "boolean",
+           "default": false,
+@@ -398,7 +454,6 @@
+       "properties": {
+         "remove-defaults": {
+           "type": "boolean",
+-          "default": false,
+           "deprecated": true,
+           "deprecated_version": "22.3",
+           "deprecated_description": "Use ``remove_defaults`` instead."
+@@ -516,9 +571,9 @@
+         },
+         "system_info": {
+           "type": "object",
+-          "description": "System and/or distro specific settings. This is not intended to be overridden by user data or vendor data.",
+           "deprecated": true,
+-          "deprecated_version": "24.2"
++          "deprecated_version": "24.2",
++          "deprecated_description": "System and/or distro specific settings. This is not intended to be overridden by user data or vendor data."
+         }
+       }
+     },
+@@ -1483,7 +1538,6 @@
+         },
+         "grub-dpkg": {
+           "type": "object",
+-          "description": "An alias for ``grub_dpkg``",
+           "deprecated": true,
+           "deprecated_version": "22.2",
+           "deprecated_description": "Use ``grub_dpkg`` instead."
+@@ -2082,24 +2136,18 @@
+         },
+         "apt_update": {
+           "type": "boolean",
+-          "default": false,
+-          "description": "Default: ``false``.",
+           "deprecated": true,
+           "deprecated_version": "22.2",
+           "deprecated_description": "Use ``package_update`` instead."
+         },
+         "apt_upgrade": {
+           "type": "boolean",
+-          "default": false,
+-          "description": "Default: ``false``.",
+           "deprecated": true,
+           "deprecated_version": "22.2",
+           "deprecated_description": "Use ``package_upgrade`` instead."
+         },
+         "apt_reboot_if_required": {
+           "type": "boolean",
+-          "default": false,
+-          "description": "Default: ``false``.",
+           "deprecated": true,
+           "deprecated_version": "22.2",
+           "deprecated_description": "Use ``package_reboot_if_required`` instead."
+@@ -2798,7 +2846,6 @@
+                 }
+               ],
+               "minItems": 1,
+-              "description": "List of ``username:password`` pairs. Each user will have the corresponding password set. A password can be randomly generated by specifying ``RANDOM`` or ``R`` as a user's password. A hashed password, created by a tool like ``mkpasswd``, can be specified. A regex (``r'\\$(1|2a|2y|5|6)(\\$.+){2}'``) is used to determine if a password value should be treated as a hash.",
+               "deprecated": true,
+               "deprecated_version": "22.2",
+               "deprecated_description": "Use ``users`` instead."
+diff --git a/tests/unittests/config/test_cc_grub_dpkg.py b/tests/unittests/config/test_cc_grub_dpkg.py
+index b4bd48df..36ef7fd9 100644
+--- a/tests/unittests/config/test_cc_grub_dpkg.py
++++ b/tests/unittests/config/test_cc_grub_dpkg.py
+@@ -300,8 +300,8 @@ class TestGrubDpkgSchema:
+                 pytest.raises(
+                     SchemaValidationError,
+                     match=(
+-                        "Cloud config schema deprecations: grub-dpkg: An alias"
+-                        " for ``grub_dpkg`` Deprecated in version 22.2. Use "
++                        "Cloud config schema deprecations: grub-dpkg:"
++                        "  Deprecated in version 22.2. Use "
+                         "``grub_dpkg`` instead."
+                     ),
+                 ),
+diff --git a/tests/unittests/config/test_cc_package_update_upgrade_install.py b/tests/unittests/config/test_cc_package_update_upgrade_install.py
+index 9ba7f178..734dbc53 100644
+--- a/tests/unittests/config/test_cc_package_update_upgrade_install.py
++++ b/tests/unittests/config/test_cc_package_update_upgrade_install.py
+@@ -192,16 +192,16 @@ class TestPackageUpdateUpgradeSchema:
+             (
+                 {"apt_update": False},
+                 (
+-                    "Cloud config schema deprecations: apt_update: "
+-                    "Default: ``false``. Deprecated in version 22.2. "
++                    "Cloud config schema deprecations: apt_update:  "
++                    "Deprecated in version 22.2. "
+                     "Use ``package_update`` instead."
+                 ),
+             ),
+             (
+                 {"apt_upgrade": False},
+                 (
+-                    "Cloud config schema deprecations: apt_upgrade: "
+-                    "Default: ``false``. Deprecated in version 22.2. "
++                    "Cloud config schema deprecations: apt_upgrade:  "
++                    "Deprecated in version 22.2. "
+                     "Use ``package_upgrade`` instead."
+                 ),
+             ),
+@@ -209,8 +209,7 @@ class TestPackageUpdateUpgradeSchema:
+                 {"apt_reboot_if_required": False},
+                 (
+                     "Cloud config schema deprecations: "
+-                    "apt_reboot_if_required: Default: ``false``. "
+-                    "Deprecated in version 22.2. Use "
++                    "apt_reboot_if_required:  Deprecated in version 22.2. Use "
+                     "``package_reboot_if_required`` instead."
+                 ),
+             ),
+diff --git a/tests/unittests/config/test_cc_users_groups.py b/tests/unittests/config/test_cc_users_groups.py
+index 53e231e1..4ca67f77 100644
+--- a/tests/unittests/config/test_cc_users_groups.py
++++ b/tests/unittests/config/test_cc_users_groups.py
+@@ -371,9 +371,20 @@ class TestUsersGroupsSchema:
+                     SchemaValidationError,
+                     match=(
+                         "Cloud config schema deprecations: "
+-                        "users.0.lock-passwd: Default: ``true`` "
+-                        "Deprecated in version 22.3. Use "
+-                        "``lock_passwd`` instead."
++                        "users.0.lock-passwd:  Deprecated in version 22.3."
++                        " Use ``lock_passwd`` instead."
++                    ),
++                ),
++                False,
++            ),
++            (
++                {"users": [{"name": "bbsw", "no-create-home": True}]},
++                pytest.raises(
++                    SchemaValidationError,
++                    match=(
++                        "Cloud config schema deprecations: "
++                        "users.0.no-create-home:  Deprecated in version 24.2."
++                        " Use ``no_create_home`` instead."
+                     ),
+                 ),
+                 False,
+@@ -394,13 +405,10 @@ class TestUsersGroupsSchema:
+                     SchemaValidationError,
+                     match=(
+                         "Cloud config schema deprecations: "
+-                        "users.0.groups.adm: When providing an object "
+-                        "for users.groups the ``<group_name>`` keys "
+-                        "are the groups to add this user to Deprecated"
+-                        " in version 23.1., users.0.groups.sudo: When "
+-                        "providing an object for users.groups the "
+-                        "``<group_name>`` keys are the groups to add "
+-                        "this user to Deprecated in version 23.1."
++                        "users.0.groups.adm:  Deprecated in version 23.1. "
++                        "The use of ``object`` type is deprecated. Use "
++                        "``string`` or ``array`` of ``string`` instead., "
++                        "users.0.groups.sudo:  Deprecated in version 23.1."
+                     ),
+                 ),
+                 False,
+@@ -456,10 +464,7 @@ class TestUsersGroupsSchema:
+                     SchemaValidationError,
+                     match=(
+                         "Cloud config schema deprecations: "
+-                        "user.groups.sbuild: When providing an object "
+-                        "for users.groups the ``<group_name>`` keys "
+-                        "are the groups to add this user to Deprecated"
+-                        " in version 23.1."
++                        "user.groups.sbuild:  Deprecated in version 23.1."
+                     ),
+                 ),
+                 False,
+diff --git a/tests/unittests/config/test_schema.py b/tests/unittests/config/test_schema.py
+index 52667332..8208affc 100644
+--- a/tests/unittests/config/test_schema.py
++++ b/tests/unittests/config/test_schema.py
+@@ -2251,9 +2251,9 @@ class TestHandleSchemaArgs:
+                     apt_reboot_if_required: true            # D3
+ 
+                     # Deprecations: -------------
+-                    # D1: Default: ``false``. Deprecated in version 22.2. Use ``package_update`` instead.
+-                    # D2: Default: ``false``. Deprecated in version 22.2. Use ``package_upgrade`` instead.
+-                    # D3: Default: ``false``. Deprecated in version 22.2. Use ``package_reboot_if_required`` instead.
++                    # D1: Deprecated in version 22.2. Use ``package_update`` instead.
++                    # D2: Deprecated in version 22.2. Use ``package_upgrade`` instead.
++                    # D3: Deprecated in version 22.2. Use ``package_reboot_if_required`` instead.
+ 
+                     Valid schema {cfg_file}
+                     """  # noqa: E501
+@@ -2264,11 +2264,10 @@ class TestHandleSchemaArgs:
+                 dedent(
+                     """\
+                     Cloud config schema deprecations: \
+-apt_reboot_if_required: Default: ``false``. Deprecated in version 22.2.\
+- Use ``package_reboot_if_required`` instead., apt_update: Default: \
+-``false``. Deprecated in version 22.2. Use ``package_update`` instead.,\
+- apt_upgrade: Default: ``false``. Deprecated in version 22.2. Use \
+-``package_upgrade`` instead.\
++apt_reboot_if_required: Deprecated in version 22.2. Use\
++ ``package_reboot_if_required`` instead., apt_update: Deprecated in version\
++ 22.2. Use ``package_update`` instead., apt_upgrade: Deprecated in version\
++ 22.2. Use ``package_upgrade`` instead.\
+                     Valid schema {cfg_file}
+                     """  # noqa: E501
+                 ),
+-- 
+2.39.3
+

SOURCES/ci-fix-vmware-Set-IPv6-to-dhcp-when-there-is-no-IPv6-ad.patch

@@ -0,0 +1,185 @@
+From 9ee9fe608b906fe4e523cbf7fbe4539f0322ba2f Mon Sep 17 00:00:00 2001
+From: PengpengSun <40026211+PengpengSun@users.noreply.github.com>
+Date: Thu, 4 Jul 2024 04:06:39 +0800
+Subject: [PATCH 2/2] fix(vmware): Set IPv6 to dhcp when there is no IPv6 addr
+ (#5471)
+
+RH-Author: xiachen <xiachen@redhat.com>
+RH-MergeRequest: 99: fix(vmware): Set IPv6 to dhcp when there is no IPv6 addr (#5471)
+RH-Jira: RHEL-46194
+RH-Acked-by: Ani Sinha <anisinha@redhat.com>
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Commit: [1/1] fbae24c7e7f48239200eaf457d260203fb550845 (xiachen/cloud-init-centos)
+
+When there is no IPv6 addr given in the customization configuration,
+we shall set IPv6 type to dhcp6, then customized Linux network will be
+set to dhcp IPv6 explicitly.
+
+(cherry picked from commit 2b6fe6403db769de14f7c7b7e4aa65f5bea8f3e0)
+---
+ .../sources/helpers/vmware/imc/config_nic.py  |  2 +-
+ .../sources/vmware/test_vmware_config_file.py | 68 ++++++++++++++-----
+ 2 files changed, 52 insertions(+), 18 deletions(-)
+
+diff --git a/cloudinit/sources/helpers/vmware/imc/config_nic.py b/cloudinit/sources/helpers/vmware/imc/config_nic.py
+index b07214a2..254518af 100644
+--- a/cloudinit/sources/helpers/vmware/imc/config_nic.py
++++ b/cloudinit/sources/helpers/vmware/imc/config_nic.py
+@@ -207,7 +207,7 @@ class NicConfigurator:
+         """
+ 
+         if not nic.staticIpv6:
+-            return ([], [])
++            return ([{"type": "dhcp6"}], [])
+ 
+         subnet_list = []
+         # Static Ipv6
+diff --git a/tests/unittests/sources/vmware/test_vmware_config_file.py b/tests/unittests/sources/vmware/test_vmware_config_file.py
+index b53ea96c..25d3b093 100644
+--- a/tests/unittests/sources/vmware/test_vmware_config_file.py
++++ b/tests/unittests/sources/vmware/test_vmware_config_file.py
+@@ -240,27 +240,45 @@ class TestVmwareConfigFile(CiTestCase):
+             elif cfg.get("name") == nic2.get("name"):
+                 nic2.update(cfg)
+ 
++        # Test NIC1
+         self.assertEqual("physical", nic1.get("type"), "type of NIC1")
+         self.assertEqual("NIC1", nic1.get("name"), "name of NIC1")
+         self.assertEqual(
+             "00:50:56:a6:8c:08", nic1.get("mac_address"), "mac address of NIC1"
+         )
+         subnets = nic1.get("subnets")
+-        self.assertEqual(1, len(subnets), "number of subnets for NIC1")
+-        subnet = subnets[0]
+-        self.assertEqual("dhcp", subnet.get("type"), "DHCP type for NIC1")
+-        self.assertEqual("auto", subnet.get("control"), "NIC1 Control type")
++        self.assertEqual(2, len(subnets), "number of subnets for NIC1")
++        subnet_ipv4 = subnets[0]
++        self.assertEqual(
++            "dhcp", subnet_ipv4.get("type"), "Ipv4 DHCP type for NIC1"
++        )
++        self.assertEqual(
++            "auto", subnet_ipv4.get("control"), "NIC1 Control type"
++        )
++        subnet_ipv6 = subnets[1]
++        self.assertEqual(
++            "dhcp6", subnet_ipv6.get("type"), "Ipv6 DHCP type for NIC1"
++        )
+ 
++        # Test NIC2
+         self.assertEqual("physical", nic2.get("type"), "type of NIC2")
+         self.assertEqual("NIC2", nic2.get("name"), "name of NIC2")
+         self.assertEqual(
+             "00:50:56:a6:5a:de", nic2.get("mac_address"), "mac address of NIC2"
+         )
+         subnets = nic2.get("subnets")
+-        self.assertEqual(1, len(subnets), "number of subnets for NIC2")
+-        subnet = subnets[0]
+-        self.assertEqual("dhcp", subnet.get("type"), "DHCP type for NIC2")
+-        self.assertEqual("auto", subnet.get("control"), "NIC2 Control type")
++        self.assertEqual(2, len(subnets), "number of subnets for NIC2")
++        subnet_ipv4 = subnets[0]
++        self.assertEqual(
++            "dhcp", subnet_ipv4.get("type"), "Ipv4 DHCP type for NIC2"
++        )
++        self.assertEqual(
++            "auto", subnet_ipv4.get("control"), "NIC2 Control type"
++        )
++        subnet_ipv6 = subnets[1]
++        self.assertEqual(
++            "dhcp6", subnet_ipv6.get("type"), "Ipv6 DHCP type for NIC2"
++        )
+ 
+     def test_get_nics_list_static(self):
+         """Tests if NicConfigurator properly calculates network subnets
+@@ -285,6 +303,7 @@ class TestVmwareConfigFile(CiTestCase):
+                 elif cfg.get("name") == nic2.get("name"):
+                     nic2.update(cfg)
+ 
++        # Test NIC1
+         self.assertEqual("physical", nic1.get("type"), "type of NIC1")
+         self.assertEqual("NIC1", nic1.get("name"), "name of NIC1")
+         self.assertEqual(
+@@ -344,6 +363,7 @@ class TestVmwareConfigFile(CiTestCase):
+             else:
+                 self.assertEqual(True, False, "invalid gateway %s" % (gateway))
+ 
++        # Test NIC2
+         self.assertEqual("physical", nic2.get("type"), "type of NIC2")
+         self.assertEqual("NIC2", nic2.get("name"), "name of NIC2")
+         self.assertEqual(
+@@ -351,16 +371,18 @@ class TestVmwareConfigFile(CiTestCase):
+         )
+ 
+         subnets = nic2.get("subnets")
+-        self.assertEqual(1, len(subnets), "Number of subnets for NIC2")
++        self.assertEqual(2, len(subnets), "Number of subnets for NIC2")
+ 
+-        subnet = subnets[0]
+-        self.assertEqual("static", subnet.get("type"), "Subnet type")
++        subnet_ipv4 = subnets[0]
++        self.assertEqual("static", subnet_ipv4.get("type"), "Subnet type")
+         self.assertEqual(
+-            "192.168.6.102", subnet.get("address"), "Subnet address"
++            "192.168.6.102", subnet_ipv4.get("address"), "Subnet address"
+         )
+         self.assertEqual(
+-            "255.255.0.0", subnet.get("netmask"), "Subnet netmask"
++            "255.255.0.0", subnet_ipv4.get("netmask"), "Subnet netmask"
+         )
++        subnet_ipv6 = subnets[1]
++        self.assertEqual("dhcp6", subnet_ipv6.get("type"), "Subnet type")
+ 
+     def test_custom_script(self):
+         cf = ConfigFile("tests/data/vmware/cust-dhcp-2nic.cfg")
+@@ -447,7 +469,10 @@ class TestVmwareNetConfig(CiTestCase):
+                             "type": "static",
+                             "address": "10.20.87.154",
+                             "netmask": "255.255.252.0",
+-                        }
++                        },
++                        {
++                            "type": "dhcp6",
++                        },
+                     ],
+                 }
+             ],
+@@ -498,7 +523,10 @@ class TestVmwareNetConfig(CiTestCase):
+                                     "metric": 10000,
+                                 }
+                             ],
+-                        }
++                        },
++                        {
++                            "type": "dhcp6",
++                        },
+                     ],
+                 }
+             ],
+@@ -558,7 +586,10 @@ class TestVmwareNetConfig(CiTestCase):
+                                     "metric": 10000,
+                                 }
+                             ],
+-                        }
++                        },
++                        {
++                            "type": "dhcp6",
++                        },
+                     ],
+                 }
+             ],
+@@ -603,7 +634,10 @@ class TestVmwareNetConfig(CiTestCase):
+                             "address": "10.20.87.154",
+                             "netmask": "255.255.252.0",
+                             "gateway": "10.20.87.253",
+-                        }
++                        },
++                        {
++                            "type": "dhcp6",
++                        },
+                     ],
+                 }
+             ],
+-- 
+2.39.3
+