39 changed files with 3249 additions and 1137 deletions
--- a/SOURCES/0001-Add-initial-redhat-changes.patch
+++ b/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")
--- a/SOURCES/0002-Do-not-write-NM_CONTROLLED-no-in-generated-interface.patch
+++ b/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
-
--- a/SOURCES/0003-Setting-autoconnect-priority-setting-for-network-scr.patch
+++ b/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
--- a/SOURCES/0004-include-NOZEROCONF-yes-in-etc-sysconfig-network.patch
+++ b/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")
--- a/SOURCES/0004-net-network_manager-do-not-set-may-fail-to-False-for.patch
+++ b/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
-
--- a/SOURCES/0005-net-allow-dhcp6-configuration-from-generate_fallback.patch
+++ b/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
-
--- a/SOURCES/0005-settings.py-update-settings-for-rhel.patch
+++ b/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
-
--- a/SOURCES/0006-net-nm-check-for-presence-of-ifcfg-files-when-nm-con.patch
+++ b/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
-
--- a/SOURCES/0007-test-jsonschema-Pin-jsonschema-version-4781.patch
+++ b/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
-
--- a/SOURCES/0008-fix-clean-stop-warning-when-running-clean-command-47.patch
+++ b/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
-
--- a/SOURCES/0013-rhel-cloud.cfg-remove-ssh_genkeytypes-in-settings.py.patch
+++ b/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
-
--- a/SOURCES/ci-Deprecate-the-users-ssh-authorized-keys-property-516.patch
+++ b/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
+
--- a/SOURCES/ci-ci-Pin-pytest-8.0.0.-4816.patch
+++ b/SOURCES/ci-ci-Pin-pytest-8.0.0.-4816.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 +-
--- a/SOURCES/ci-Retain-exit-code-in-cloud-init-status-for-recoverabl.patch
+++ b/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
--- a/SOURCES/ci-Revert-Use-grep-for-faster-parsing-of-cloud-config-i.patch
+++ b/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

--- a/SOURCES/ci-Revert-fix-vmware-Set-IPv6-to-dhcp-when-there-is-no-.patch
+++ b/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")
+