37 changed files with 2598 additions and 8158 deletions
--- a/.cloud-init.metadata
+++ b/.cloud-init.metadata
@ -1 +1 @@
-830185bb5ce87ad86e4d1c0c62329bb255ec1648 SOURCES/cloud-init-22.1.tar.gz
+e73116733f5636eb4bc1a5e47e802c3635b9bfa2 SOURCES/23.4.tar.gz
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/cloud-init-22.1.tar.gz
+SOURCES/23.4.tar.gz
--- a/SOURCES/0001-Add-initial-redhat-changes.patch
+++ b/SOURCES/0001-Add-initial-redhat-changes.patch
@ -1,621 +0,0 @@
-From 7daf47d1ee60a132244f2a9ec4e89ad496c32c3e Mon Sep 17 00:00:00 2001
-From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-Date: Mon, 28 Mar 2022 14:08:05 +0200
-Subject: Add initial redhat setup
-
-Merged patches (22.1):
- 70f80f82 Use _systemdgeneratordir macro for cloud-init-generator handling
- 0f74e7b8 Add dhcp-client as a dependency
- 791eb2b6 Report full specific version with "cloud-init --version"
- 865805d6 source-git: Use dynamic SRPM_NAME
- 45ddc666 add the drop-in also in the %files section of cloud-init.spec
- 08d939b2 Add gdisk and openssl as deps to fix UEFI / Azure initialization
- 0531cd68 Add netifaces package as a Requires in cloud-init.spec.template
-
-Conflicts:
- .gitignore
- cloudinit/config/cc_chef.py = use double quotes instead of single quotes
- cloudinit/settings.py = use rhel settings
- cloudinit/sources/DataSourceAzure.py = remove temporary_hostname and helper
- requirements.txt = just add netifaces and not jsonschema dep
- setup.py = use double quotes instead of single quotes
-
-Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-
-Merged patches (RHEL-9/21.1):
- 5688a1d0 Removing python-nose and python-tox as dependency
- 237d57f9 Removing mock dependency
- d1c2f496 Removing python-jsonschema dependency
- 0d1cd14c Don't override default network configuration
-
-Merged patches (21.1):
- 915d30ad Change gating file to correct rhel version
- 311f318d Removing net-tools dependency
- 74731806 Adding man pages to Red Hat spec file
- 758d333d Removing blocking test from yaml configuration file
- c7e7c59c Changing permission of cloud-init-generator to 755
- 8b85abbb Installing man pages in the correct place with correct permissions
- c6808d8d Fix unit failure of cloud-final.service if NetworkManager was not present.
- 11866ef6 Report full specific version with "cloud-init --version"
-
-Rebase notes (18.5):
- added bash_completition file
- added cloud-id file
-
-Merged patches (20.3):
- 01900d0 changing ds-identify patch from /usr/lib to /usr/libexec
- 7f47ca3 Render the generator from template instead of cp
-
-Merged patches (19.4):
- 4ab5a61 Fix for network configuration not persisting after reboot
- 84cf125 Removing cloud-user from wheel
- 31290ab Adding gating tests for Azure, ESXi and AWS
-
-Merged patches (18.5):
- 2d6b469 add power-state-change module to cloud_final_modules
- 764159f Adding systemd mount options to wait for cloud-init
- da4d99e Adding disk_setup to rhel/cloud.cfg
- f5c6832 Enable cloud-init by default on vmware
-
-Conflicts:
-cloudinit/config/cc_chef.py:
- Updated header documentation text
- Replacing double quotes by simple quotes
-
-setup.py:
- Adding missing cmdclass info
-
-Signed-off-by: Eduardo Otubo <otubo@redhat.com>
-
-Changes:
- move redhat to .distro to use new build script structure
- Fixing changelog for RHEL 9
-
-Merged patches (21.1):
- 69bd7f71 DataSourceAzure.py: use hostnamectl to set hostname
- 0407867e Remove race condition between cloud-init and NetworkManager
-
-Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
---
- .distro/.gitignore                    |   1 +
- .distro/Makefile                      |  74 ++++
- .distro/Makefile.common               |  20 +
- .distro/cloud-init-tmpfiles.conf      |   1 +
- .distro/cloud-init.spec.template      | 505 ++++++++++++++++++++++++++
- .distro/gating.yaml                   |   8 +
- .distro/rpmbuild/BUILD/.gitignore     |   3 +
- .distro/rpmbuild/RPMS/.gitignore      |   3 +
- .distro/rpmbuild/SOURCES/.gitignore   |   3 +
- .distro/rpmbuild/SPECS/.gitignore     |   3 +
- .distro/rpmbuild/SRPMS/.gitignore     |   3 +
- .distro/scripts/frh.py                |  27 ++
- .distro/scripts/git-backport-diff     | 327 +++++++++++++++++
- .distro/scripts/git-compile-check     | 215 +++++++++++
- .distro/scripts/process-patches.sh    |  88 +++++
- .distro/scripts/tarball_checksum.sh   |   3 +
- .gitignore                            |   1 +
- cloudinit/config/cc_chef.py           |  65 +++-
- cloudinit/settings.py                 |  21 +-
- requirements.txt                      |   3 -
- rhel/README.rhel                      |   5 +
- rhel/cloud-init-tmpfiles.conf         |   1 +
- rhel/cloud.cfg                        |  69 ++++
- rhel/systemd/cloud-config.service     |  18 +
- rhel/systemd/cloud-config.target      |  11 +
- rhel/systemd/cloud-final.service      |  24 ++
- rhel/systemd/cloud-init-local.service |  31 ++
- rhel/systemd/cloud-init.service       |  26 ++
- rhel/systemd/cloud-init.target        |   7 +
- setup.py                              |  28 +-
- tools/read-version                    |  28 +-
- 31 files changed, 1557 insertions(+), 65 deletions(-)
- create mode 100644 .distro/.gitignore
- create mode 100644 .distro/Makefile
- create mode 100644 .distro/Makefile.common
- create mode 100644 .distro/cloud-init-tmpfiles.conf
- create mode 100644 .distro/cloud-init.spec.template
- create mode 100644 .distro/gating.yaml
- create mode 100644 .distro/rpmbuild/BUILD/.gitignore
- create mode 100644 .distro/rpmbuild/RPMS/.gitignore
- create mode 100644 .distro/rpmbuild/SOURCES/.gitignore
- create mode 100644 .distro/rpmbuild/SPECS/.gitignore
- create mode 100644 .distro/rpmbuild/SRPMS/.gitignore
- create mode 100755 .distro/scripts/frh.py
- create mode 100755 .distro/scripts/git-backport-diff
- create mode 100755 .distro/scripts/git-compile-check
- create mode 100755 .distro/scripts/process-patches.sh
- create mode 100755 .distro/scripts/tarball_checksum.sh
- create mode 100644 rhel/README.rhel
- create mode 100644 rhel/cloud-init-tmpfiles.conf
- create mode 100644 rhel/cloud.cfg
- create mode 100644 rhel/systemd/cloud-config.service
- create mode 100644 rhel/systemd/cloud-config.target
- create mode 100644 rhel/systemd/cloud-final.service
- create mode 100644 rhel/systemd/cloud-init-local.service
- create mode 100644 rhel/systemd/cloud-init.service
- create mode 100644 rhel/systemd/cloud-init.target
-
-diff --git a/cloudinit/config/cc_chef.py b/cloudinit/config/cc_chef.py
-index fdb3a6e3..d028c548 100644
--- a/cloudinit/config/cc_chef.py
-+++ b/cloudinit/config/cc_chef.py
-@@ -6,7 +6,70 @@
- #
- # This file is part of cloud-init. See LICENSE file for license information.
- 
-"""Chef: module that configures, starts and installs chef."""
-+"""
-+Chef
-+----
-+**Summary:** module that configures, starts and installs chef.
-+
-+This module enables chef to be installed (from packages or
-+from gems, or from omnibus). Before this occurs chef configurations are
-+written to disk (validation.pem, client.pem, firstboot.json, client.rb),
-+and needed chef folders/directories are created (/etc/chef and /var/log/chef
-+and so-on). Then once installing proceeds correctly if configured chef will
-+be started (in daemon mode or in non-daemon mode) and then once that has
-+finished (if ran in non-daemon mode this will be when chef finishes
-+converging, if ran in daemon mode then no further actions are possible since
-+chef will have forked into its own process) then a post run function can
-+run that can do finishing activities (such as removing the validation pem
-+file).
-+
-+**Internal name:** ``cc_chef``
-+
-+**Module frequency:** per always
-+
-+**Supported distros:** all
-+
-+**Config keys**::
-+
-+    chef:
-+       directories: (defaulting to /etc/chef, /var/log/chef, /var/lib/chef,
-+                     /var/cache/chef, /var/backups/chef, /run/chef)
-+       validation_cert: (optional string to be written to file validation_key)
-+                        special value 'system' means set use existing file
-+       validation_key: (optional the path for validation_cert. default
-+                        /etc/chef/validation.pem)
-+       firstboot_path: (path to write run_list and initial_attributes keys that
-+                        should also be present in this configuration, defaults
-+                        to /etc/chef/firstboot.json)
-+       exec: boolean to run or not run chef (defaults to false, unless
-+                                             a gem installed is requested
-+                                             where this will then default
-+                                             to true)
-+
-+    chef.rb template keys (if falsey, then will be skipped and not
-+                           written to /etc/chef/client.rb)
-+
-+    chef:
-+      client_key:
-+      encrypted_data_bag_secret:
-+      environment:
-+      file_backup_path:
-+      file_cache_path:
-+      json_attribs:
-+      log_level:
-+      log_location:
-+      node_name:
-+      omnibus_url:
-+      omnibus_url_retries:
-+      omnibus_version:
-+      pid_file:
-+      server_url:
-+      show_time:
-+      ssl_verify_mode:
-+      validation_cert:
-+      validation_key:
-+      validation_name:
-+"""
- 
- import itertools
- import json
-diff --git a/cloudinit/settings.py b/cloudinit/settings.py
-index ecc1403b..a780e21e 100644
--- a/cloudinit/settings.py
-+++ b/cloudinit/settings.py
-@@ -48,16 +48,19 @@ CFG_BUILTIN = {
-         # At the end to act as a 'catch' when none of the above work...
-         "None",
-     ],
-    "def_log_file": "/var/log/cloud-init.log",
-    "log_cfgs": [],
-    "syslog_fix_perms": ["syslog:adm", "root:adm", "root:wheel", "root:root"],
-    "system_info": {
-        "paths": {
-            "cloud_dir": "/var/lib/cloud",
-            "templates_dir": "/etc/cloud/templates/",
-+    'def_log_file': '/var/log/cloud-init.log',
-+    'log_cfgs': [],
-+    'mount_default_fields': [None, None, 'auto', 'defaults,nofail', '0', '2'],
-+    'ssh_deletekeys': False,
-+    'ssh_genkeytypes': [],
-+    'syslog_fix_perms': [],
-+    'system_info': {
-+        'paths': {
-+            'cloud_dir': '/var/lib/cloud',
-+            'templates_dir': '/etc/cloud/templates/',
-         },
-        "distro": "ubuntu",
-        "network": {"renderers": None},
-+        'distro': 'rhel',
-+        'network': {'renderers': None},
-     },
-     "vendor_data": {"enabled": True, "prefix": []},
-     "vendor_data2": {"enabled": True, "prefix": []},
-diff --git a/requirements.txt b/requirements.txt
-index c4adc455..f77f1d73 100644
--- a/requirements.txt
-+++ b/requirements.txt
-@@ -30,9 +30,6 @@ requests
- # For patching pieces of cloud-config together
- jsonpatch
- 
-# For validating cloud-config sections per schema definitions
-jsonschema
-
- # Used by DataSourceVMware to inspect the host's network configuration during
- # the "setup()" function.
- #
-diff --git a/rhel/README.rhel b/rhel/README.rhel
-new file mode 100644
-index 00000000..aa29630d
--- /dev/null
-+++ b/rhel/README.rhel
-@@ -0,0 +1,5 @@
-+The following cloud-init modules are currently unsupported on this OS:
-+ - apt_update_upgrade ('apt_update', 'apt_upgrade', 'apt_mirror', 'apt_preserve_sources_list', 'apt_old_mirror', 'apt_sources', 'debconf_selections', 'packages' options)
-+ - byobu ('byobu_by_default' option)
-+ - chef
-+ - grub_dpkg
-diff --git a/rhel/cloud-init-tmpfiles.conf b/rhel/cloud-init-tmpfiles.conf
-new file mode 100644
-index 00000000..0c6d2a3b
--- /dev/null
-+++ b/rhel/cloud-init-tmpfiles.conf
-@@ -0,0 +1 @@
-+d /run/cloud-init 0700 root root - -
-diff --git a/rhel/cloud.cfg b/rhel/cloud.cfg
-new file mode 100644
-index 00000000..9ecba215
--- /dev/null
-+++ b/rhel/cloud.cfg
-@@ -0,0 +1,69 @@
-+users:
-+ - default
-+
-+disable_root: 1
-+ssh_pwauth:   0
-+
-+mount_default_fields: [~, ~, 'auto', 'defaults,nofail,x-systemd.requires=cloud-init.service', '0', '2']
-+resize_rootfs_tmp: /dev
-+ssh_deletekeys:   1
-+ssh_genkeytypes:  ~
-+syslog_fix_perms: ~
-+disable_vmware_customization: false
-+
-+cloud_init_modules:
-+ - disk_setup
-+ - migrator
-+ - bootcmd
-+ - write-files
-+ - growpart
-+ - resizefs
-+ - set_hostname
-+ - update_hostname
-+ - update_etc_hosts
-+ - rsyslog
-+ - users-groups
-+ - ssh
-+
-+cloud_config_modules:
-+ - mounts
-+ - locale
-+ - set-passwords
-+ - rh_subscription
-+ - yum-add-repo
-+ - package-update-upgrade-install
-+ - timezone
-+ - puppet
-+ - chef
-+ - salt-minion
-+ - mcollective
-+ - disable-ec2-metadata
-+ - runcmd
-+
-+cloud_final_modules:
-+ - rightscale_userdata
-+ - scripts-per-once
-+ - scripts-per-boot
-+ - scripts-per-instance
-+ - scripts-user
-+ - ssh-authkey-fingerprints
-+ - keys-to-console
-+ - phone-home
-+ - final-message
-+ - power-state-change
-+
-+system_info:
-+  default_user:
-+    name: cloud-user
-+    lock_passwd: true
-+    gecos: Cloud User
-+    groups: [adm, systemd-journal]
-+    sudo: ["ALL=(ALL) NOPASSWD:ALL"]
-+    shell: /bin/bash
-+  distro: rhel
-+  paths:
-+    cloud_dir: /var/lib/cloud
-+    templates_dir: /etc/cloud/templates
-+  ssh_svcname: sshd
-+
-+# vim:syntax=yaml
-diff --git a/rhel/systemd/cloud-config.service b/rhel/systemd/cloud-config.service
-new file mode 100644
-index 00000000..f3dcd4be
--- /dev/null
-+++ b/rhel/systemd/cloud-config.service
-@@ -0,0 +1,18 @@
-+[Unit]
-+Description=Apply the settings specified in cloud-config
-+After=network-online.target cloud-config.target
-+Wants=network-online.target cloud-config.target
-+ConditionPathExists=!/etc/cloud/cloud-init.disabled
-+ConditionKernelCommandLine=!cloud-init=disabled
-+
-+[Service]
-+Type=oneshot
-+ExecStart=/usr/bin/cloud-init modules --mode=config
-+RemainAfterExit=yes
-+TimeoutSec=0
-+
-+# Output needs to appear in instance console output
-+StandardOutput=journal+console
-+
-+[Install]
-+WantedBy=cloud-init.target
-diff --git a/rhel/systemd/cloud-config.target b/rhel/systemd/cloud-config.target
-new file mode 100644
-index 00000000..ae9b7d02
--- /dev/null
-+++ b/rhel/systemd/cloud-config.target
-@@ -0,0 +1,11 @@
-+# cloud-init normally emits a "cloud-config" upstart event to inform third
-+# parties that cloud-config is available, which does us no good when we're
-+# using systemd.  cloud-config.target serves as this synchronization point
-+# instead.  Services that would "start on cloud-config" with upstart can
-+# instead use "After=cloud-config.target" and "Wants=cloud-config.target"
-+# as appropriate.
-+
-+[Unit]
-+Description=Cloud-config availability
-+Wants=cloud-init-local.service cloud-init.service
-+After=cloud-init-local.service cloud-init.service
-diff --git a/rhel/systemd/cloud-final.service b/rhel/systemd/cloud-final.service
-new file mode 100644
-index 00000000..e281c0cf
--- /dev/null
-+++ b/rhel/systemd/cloud-final.service
-@@ -0,0 +1,24 @@
-+[Unit]
-+Description=Execute cloud user/final scripts
-+After=network-online.target cloud-config.service rc-local.service
-+Wants=network-online.target cloud-config.service
-+ConditionPathExists=!/etc/cloud/cloud-init.disabled
-+ConditionKernelCommandLine=!cloud-init=disabled
-+
-+[Service]
-+Type=oneshot
-+ExecStart=/usr/bin/cloud-init modules --mode=final
-+RemainAfterExit=yes
-+TimeoutSec=0
-+KillMode=process
-+# Restart NetworkManager if it is present and running.
-+ExecStartPost=/bin/sh -c 'u=NetworkManager.service; \
-+ out=$(systemctl show --property=SubState $u) || exit; \
-+ [ "$out" = "SubState=running" ] || exit 0; \
-+ systemctl reload-or-try-restart $u'
-+
-+# Output needs to appear in instance console output
-+StandardOutput=journal+console
-+
-+[Install]
-+WantedBy=cloud-init.target
-diff --git a/rhel/systemd/cloud-init-local.service b/rhel/systemd/cloud-init-local.service
-new file mode 100644
-index 00000000..8f9f6c9f
--- /dev/null
-+++ b/rhel/systemd/cloud-init-local.service
-@@ -0,0 +1,31 @@
-+[Unit]
-+Description=Initial cloud-init job (pre-networking)
-+DefaultDependencies=no
-+Wants=network-pre.target
-+After=systemd-remount-fs.service
-+Requires=dbus.socket
-+After=dbus.socket
-+Before=NetworkManager.service network.service
-+Before=network-pre.target
-+Before=shutdown.target
-+Before=firewalld.target
-+Conflicts=shutdown.target
-+RequiresMountsFor=/var/lib/cloud
-+ConditionPathExists=!/etc/cloud/cloud-init.disabled
-+ConditionKernelCommandLine=!cloud-init=disabled
-+
-+[Service]
-+Type=oneshot
-+ExecStartPre=/bin/mkdir -p /run/cloud-init
-+ExecStartPre=/sbin/restorecon /run/cloud-init
-+ExecStartPre=/usr/bin/touch /run/cloud-init/enabled
-+ExecStart=/usr/bin/cloud-init init --local
-+ExecStart=/bin/touch /run/cloud-init/network-config-ready
-+RemainAfterExit=yes
-+TimeoutSec=0
-+
-+# Output needs to appear in instance console output
-+StandardOutput=journal+console
-+
-+[Install]
-+WantedBy=cloud-init.target
-diff --git a/rhel/systemd/cloud-init.service b/rhel/systemd/cloud-init.service
-new file mode 100644
-index 00000000..0b3d796d
--- /dev/null
-+++ b/rhel/systemd/cloud-init.service
-@@ -0,0 +1,26 @@
-+[Unit]
-+Description=Initial cloud-init job (metadata service crawler)
-+Wants=cloud-init-local.service
-+Wants=sshd-keygen.service
-+Wants=sshd.service
-+After=cloud-init-local.service
-+After=NetworkManager.service network.service
-+After=NetworkManager-wait-online.service
-+Before=network-online.target
-+Before=sshd-keygen.service
-+Before=sshd.service
-+Before=systemd-user-sessions.service
-+ConditionPathExists=!/etc/cloud/cloud-init.disabled
-+ConditionKernelCommandLine=!cloud-init=disabled
-+
-+[Service]
-+Type=oneshot
-+ExecStart=/usr/bin/cloud-init init
-+RemainAfterExit=yes
-+TimeoutSec=0
-+
-+# Output needs to appear in instance console output
-+StandardOutput=journal+console
-+
-+[Install]
-+WantedBy=cloud-init.target
-diff --git a/rhel/systemd/cloud-init.target b/rhel/systemd/cloud-init.target
-new file mode 100644
-index 00000000..083c3b6f
--- /dev/null
-+++ b/rhel/systemd/cloud-init.target
-@@ -0,0 +1,7 @@
-+# cloud-init target is enabled by cloud-init-generator
-+# To disable it you can either:
-+#  a.) boot with kernel cmdline of 'cloud-init=disabled'
-+#  b.) touch a file /etc/cloud/cloud-init.disabled
-+[Unit]
-+Description=Cloud-init target
-+After=multi-user.target
-diff --git a/setup.py b/setup.py
-index a9132d2c..3c377eaa 100755
--- a/setup.py
-+++ b/setup.py
-@@ -139,21 +139,6 @@ INITSYS_FILES = {
-     "sysvinit_deb": [f for f in glob("sysvinit/debian/*") if is_f(f)],
-     "sysvinit_openrc": [f for f in glob("sysvinit/gentoo/*") if is_f(f)],
-     "sysvinit_suse": [f for f in glob("sysvinit/suse/*") if is_f(f)],
-    "systemd": [
-        render_tmpl(f)
-        for f in (
-            glob("systemd/*.tmpl")
-            + glob("systemd/*.service")
-            + glob("systemd/*.socket")
-            + glob("systemd/*.target")
-        )
-        if (is_f(f) and not is_generator(f))
-    ],
-    "systemd.generators": [
-        render_tmpl(f, mode=0o755)
-        for f in glob("systemd/*")
-        if is_f(f) and is_generator(f)
-    ],
-     "upstart": [f for f in glob("upstart/*") if is_f(f)],
- }
- INITSYS_ROOTS = {
-@@ -163,10 +148,6 @@ INITSYS_ROOTS = {
-     "sysvinit_deb": "etc/init.d",
-     "sysvinit_openrc": "etc/init.d",
-     "sysvinit_suse": "etc/init.d",
-    "systemd": pkg_config_read("systemd", "systemdsystemunitdir"),
-    "systemd.generators": pkg_config_read(
-        "systemd", "systemdsystemgeneratordir"
-    ),
-     "upstart": "etc/init/",
- }
- INITSYS_TYPES = sorted([f.partition(".")[0] for f in INITSYS_ROOTS.keys()])
-@@ -281,15 +262,13 @@ data_files = [
-     (
-         USR_LIB_EXEC + "/cloud-init",
-         [
-            "tools/ds-identify",
-             "tools/hook-hotplug",
-             "tools/uncloud-init",
-             "tools/write-ssh-key-fingerprints",
-         ],
-     ),
-     (
-        USR + "/share/bash-completion/completions",
-        ["bash_completion/cloud-init"],
-+        ETC + "/bash_completion.d", ["bash_completion/cloud-init"],
-     ),
-     (USR + "/share/doc/cloud-init", [f for f in glob("doc/*") if is_f(f)]),
-     (
-@@ -308,8 +287,7 @@ if not platform.system().endswith("BSD"):
-                 ETC + "/NetworkManager/dispatcher.d/",
-                 ["tools/hook-network-manager"],
-             ),
-            (ETC + "/dhcp/dhclient-exit-hooks.d/", ["tools/hook-dhclient"]),
-            (LIB + "/udev/rules.d", [f for f in glob("udev/*.rules")]),
-+            ("/usr/lib/udev/rules.d", [f for f in glob("udev/*.rules")]),
-             (
-                 ETC + "/systemd/system/sshd-keygen@.service.d/",
-                 ["systemd/disable-sshd-keygen-if-cloud-init-active.conf"],
-@@ -339,8 +317,6 @@ setuptools.setup(
-     scripts=["tools/cloud-init-per"],
-     license="Dual-licensed under GPLv3 or Apache 2.0",
-     data_files=data_files,
-    install_requires=requirements,
-    cmdclass=cmdclass,
-     entry_points={
-         "console_scripts": [
-             "cloud-init = cloudinit.cmd.main:main",
-diff --git a/tools/read-version b/tools/read-version
-index 02c90643..79755f78 100755
--- a/tools/read-version
-+++ b/tools/read-version
-@@ -71,32 +71,8 @@ version_long = None
- is_release_branch_ci = (
-     os.environ.get("TRAVIS_PULL_REQUEST_BRANCH", "").startswith("upstream/")
- )
-if is_gitdir(_tdir) and which("git") and not is_release_branch_ci:
-    flags = []
-    if use_tags:
-        flags = ['--tags']
-    cmd = ['git', 'describe', '--abbrev=8', '--match=[0-9]*'] + flags
-
-    try:
-        version = tiny_p(cmd).strip()
-    except RuntimeError:
-        version = None
-
-    if version is None or not version.startswith(src_version):
-        sys.stderr.write("git describe version (%s) differs from "
-                         "cloudinit.version (%s)\n" % (version, src_version))
-        sys.stderr.write(
-            "Please get the latest upstream tags.\n"
-            "As an example, this can be done with the following:\n"
-            "$ git remote add upstream https://git.launchpad.net/cloud-init\n"
-            "$ git fetch upstream --tags\n"
-        )
-        sys.exit(1)
-
-    version_long = tiny_p(cmd + ["--long"]).strip()
-else:
-    version = src_version
-    version_long = None
-+version = src_version
-+version_long = None
- 
- # version is X.Y.Z[+xxx.gHASH]
- # version_long is None or X.Y.Z-xxx-gHASH
-- 
-2.31.1
-
--- 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,282 +0,0 @@
-From c521ec2ce5b1d9a7322ce152011b8792f121bf5c Mon Sep 17 00:00:00 2001
-From: Eduardo Otubo <otubo@redhat.com>
-Date: Fri, 7 May 2021 13:36:06 +0200
-Subject: 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>
---
- cloudinit/net/sysconfig.py  | 12 ++++++++++--
- tests/unittests/test_net.py | 28 ----------------------------
- 2 files changed, 10 insertions(+), 30 deletions(-)
-
-diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
-index ba85c4f6..d8c53312 100644
--- a/cloudinit/net/sysconfig.py
-+++ b/cloudinit/net/sysconfig.py
-@@ -336,7 +336,6 @@ class Renderer(renderer.Renderer):
-         "rhel": {
-             "ONBOOT": True,
-             "USERCTL": False,
-            "NM_CONTROLLED": False,
-             "BOOTPROTO": "none",
-         },
-         "suse": {"BOOTPROTO": "static", "STARTMODE": "auto"},
-@@ -1039,7 +1038,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/test_net.py b/tests/unittests/test_net.py
-index 47e4ba00..591241b3 100644
--- a/tests/unittests/test_net.py
-+++ b/tests/unittests/test_net.py
-@@ -579,7 +579,6 @@ GATEWAY=172.19.3.254
- HWADDR=fa:16:3e:ed:9a:59
- IPADDR=172.19.1.34
- NETMASK=255.255.252.0
-NM_CONTROLLED=no
- ONBOOT=yes
- TYPE=Ethernet
- USERCTL=no
-@@ -712,7 +711,6 @@ IPADDR=172.19.1.34
- IPADDR1=10.0.0.10
- NETMASK=255.255.252.0
- NETMASK1=255.255.255.0
-NM_CONTROLLED=no
- ONBOOT=yes
- TYPE=Ethernet
- USERCTL=no
-@@ -874,7 +872,6 @@ IPV6_AUTOCONF=no
- IPV6_DEFAULTGW=2001:DB8::1
- IPV6_FORCE_ACCEPT_RA=no
- NETMASK=255.255.252.0
-NM_CONTROLLED=no
- ONBOOT=yes
- TYPE=Ethernet
- USERCTL=no
-@@ -1053,7 +1050,6 @@ NETWORK_CONFIGS = {
-                 BOOTPROTO=none
-                 DEVICE=eth1
-                 HWADDR=cf:d6:af:48:e8:80
-                NM_CONTROLLED=no
-                 ONBOOT=yes
-                 TYPE=Ethernet
-                 USERCTL=no"""
-@@ -1072,7 +1068,6 @@ NETWORK_CONFIGS = {
-                 IPADDR=192.168.21.3
-                 NETMASK=255.255.255.0
-                 METRIC=10000
-                NM_CONTROLLED=no
-                 ONBOOT=yes
-                 TYPE=Ethernet
-                 USERCTL=no"""
-@@ -1244,7 +1239,6 @@ NETWORK_CONFIGS = {
-                 IPV6_AUTOCONF=no
-                 IPV6_FORCE_ACCEPT_RA=no
-                 NETMASK=255.255.255.0
-                NM_CONTROLLED=no
-                 ONBOOT=yes
-                 TYPE=Ethernet
-                 USERCTL=no
-@@ -2093,7 +2087,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
-                 DHCPV6C=yes
-                 IPV6INIT=yes
-                 MACADDR=aa:bb:cc:dd:ee:ff
-                NM_CONTROLLED=no
-                 ONBOOT=yes
-                 TYPE=Bond
-                 USERCTL=no"""
-@@ -2103,7 +2096,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
-                 BOOTPROTO=dhcp
-                 DEVICE=bond0.200
-                 DHCLIENT_SET_DEFAULT_ROUTE=no
-                NM_CONTROLLED=no
-                 ONBOOT=yes
-                 PHYSDEV=bond0
-                 USERCTL=no
-@@ -2123,7 +2115,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
-                 IPV6_DEFAULTGW=2001:4800:78ff:1b::1
-                 MACADDR=bb:bb:bb:bb:bb:aa
-                 NETMASK=255.255.255.0
-                NM_CONTROLLED=no
-                 ONBOOT=yes
-                 PRIO=22
-                 STP=no
-@@ -2135,7 +2126,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
-                 BOOTPROTO=none
-                 DEVICE=eth0
-                 HWADDR=c0:d6:9f:2c:e8:80
-                NM_CONTROLLED=no
-                 ONBOOT=yes
-                 TYPE=Ethernet
-                 USERCTL=no"""
-@@ -2154,7 +2144,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
-                 MTU=1500
-                 NETMASK=255.255.255.0
-                 NETMASK1=255.255.255.0
-                NM_CONTROLLED=no
-                 ONBOOT=yes
-                 PHYSDEV=eth0
-                 USERCTL=no
-@@ -2166,7 +2155,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
-                 DEVICE=eth1
-                 HWADDR=aa:d6:9f:2c:e8:80
-                 MASTER=bond0
-                NM_CONTROLLED=no
-                 ONBOOT=yes
-                 SLAVE=yes
-                 TYPE=Ethernet
-@@ -2178,7 +2166,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
-                 DEVICE=eth2
-                 HWADDR=c0:bb:9f:2c:e8:80
-                 MASTER=bond0
-                NM_CONTROLLED=no
-                 ONBOOT=yes
-                 SLAVE=yes
-                 TYPE=Ethernet
-@@ -2190,7 +2177,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
-                 BRIDGE=br0
-                 DEVICE=eth3
-                 HWADDR=66:bb:9f:2c:e8:80
-                NM_CONTROLLED=no
-                 ONBOOT=yes
-                 TYPE=Ethernet
-                 USERCTL=no"""
-@@ -2201,7 +2187,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
-                 BRIDGE=br0
-                 DEVICE=eth4
-                 HWADDR=98:bb:9f:2c:e8:80
-                NM_CONTROLLED=no
-                 ONBOOT=yes
-                 TYPE=Ethernet
-                 USERCTL=no"""
-@@ -2212,7 +2197,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
-                 DEVICE=eth5
-                 DHCLIENT_SET_DEFAULT_ROUTE=no
-                 HWADDR=98:bb:9f:2c:e8:8a
-                NM_CONTROLLED=no
-                 ONBOOT=no
-                 TYPE=Ethernet
-                 USERCTL=no"""
-@@ -2689,7 +2673,6 @@ iface bond0 inet6 static
-         MTU=9000
-         NETMASK=255.255.255.0
-         NETMASK1=255.255.255.0
-        NM_CONTROLLED=no
-         ONBOOT=yes
-         TYPE=Bond
-         USERCTL=no
-@@ -2701,7 +2684,6 @@ iface bond0 inet6 static
-         DEVICE=bond0s0
-         HWADDR=aa:bb:cc:dd:e8:00
-         MASTER=bond0
-        NM_CONTROLLED=no
-         ONBOOT=yes
-         SLAVE=yes
-         TYPE=Ethernet
-@@ -2729,7 +2711,6 @@ iface bond0 inet6 static
-         DEVICE=bond0s1
-         HWADDR=aa:bb:cc:dd:e8:01
-         MASTER=bond0
-        NM_CONTROLLED=no
-         ONBOOT=yes
-         SLAVE=yes
-         TYPE=Ethernet
-@@ -2794,7 +2775,6 @@ iface bond0 inet6 static
-                 BOOTPROTO=none
-                 DEVICE=en0
-                 HWADDR=aa:bb:cc:dd:e8:00
-                NM_CONTROLLED=no
-                 ONBOOT=yes
-                 TYPE=Ethernet
-                 USERCTL=no"""
-@@ -2815,7 +2795,6 @@ iface bond0 inet6 static
-                 MTU=2222
-                 NETMASK=255.255.255.0
-                 NETMASK1=255.255.255.0
-                NM_CONTROLLED=no
-                 ONBOOT=yes
-                 PHYSDEV=en0
-                 USERCTL=no
-@@ -2890,7 +2869,6 @@ iface bond0 inet6 static
-                 DEVICE=br0
-                 IPADDR=192.168.2.2
-                 NETMASK=255.255.255.0
-                NM_CONTROLLED=no
-                 ONBOOT=yes
-                 PRIO=22
-                 STP=no
-@@ -3032,7 +3010,6 @@ iface bond0 inet6 static
-                 HWADDR=52:54:00:12:34:00
-                 IPADDR=192.168.1.2
-                 NETMASK=255.255.255.0
-                NM_CONTROLLED=no
-                 ONBOOT=no
-                 TYPE=Ethernet
-                 USERCTL=no
-@@ -3044,7 +3021,6 @@ iface bond0 inet6 static
-                 DEVICE=eth1
-                 HWADDR=52:54:00:12:34:aa
-                 MTU=1480
-                NM_CONTROLLED=no
-                 ONBOOT=yes
-                 TYPE=Ethernet
-                 USERCTL=no
-@@ -3055,7 +3031,6 @@ iface bond0 inet6 static
-                 BOOTPROTO=none
-                 DEVICE=eth2
-                 HWADDR=52:54:00:12:34:ff
-                NM_CONTROLLED=no
-                 ONBOOT=no
-                 TYPE=Ethernet
-                 USERCTL=no
-@@ -3628,7 +3603,6 @@ class TestRhelSysConfigRendering(CiTestCase):
- BOOTPROTO=dhcp
- DEVICE=eth1000
- HWADDR=07-1c-c6-75-a4-be
-NM_CONTROLLED=no
- ONBOOT=yes
- TYPE=Ethernet
- USERCTL=no
-@@ -3840,7 +3814,6 @@ GATEWAY=10.0.2.2
- HWADDR=52:54:00:12:34:00
- IPADDR=10.0.2.15
- NETMASK=255.255.255.0
-NM_CONTROLLED=no
- ONBOOT=yes
- TYPE=Ethernet
- USERCTL=no
-@@ -3910,7 +3883,6 @@ USERCTL=no
- #
- BOOTPROTO=dhcp
- DEVICE=eth0
-NM_CONTROLLED=no
- ONBOOT=yes
- TYPE=Ethernet
- USERCTL=no
-- 
-2.31.1
-
--- a/SOURCES/0003-Adding-_netdev-to-the-default-mount-configuration.patch
+++ b/SOURCES/0003-Adding-_netdev-to-the-default-mount-configuration.patch
@ -1,42 +0,0 @@
-From b952fa472be3f417e0d857c8647a1b930624c247 Mon Sep 17 00:00:00 2001
-From: Eduardo Otubo <otubo@redhat.com>
-Date: Fri, 25 Feb 2022 05:05:17 -0500
-Subject: Adding _netdev to the default mount configuration
-
-RH-Author: Eduardo Otubo <otubo@redhat.com>
-RH-MergeRequest: 21: Adding _netdev to the default mount configuration
-RH-Commit: [1/1] 250860a24db396a5088d207d6526a0028ac73eb3 (otubo/cloud-init-src)
-RH-Bugzilla: 1998445
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-
-Adding _netdev option also to the default configuration for RHEL.
-
-rhbz: 1998445
-x-downstream-only: yes
-
-Signed-off-by: Eduardo Otubo <otubo@redhat.com>
-
-patch_name: ci-Adding-_netdev-to-the-default-mount-configuration.patch
-present_in_specfile: true
-location_in_specfile: 29
---
- rhel/cloud.cfg | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/rhel/cloud.cfg b/rhel/cloud.cfg
-index 9ecba215..1ec1a6c6 100644
--- a/rhel/cloud.cfg
-+++ b/rhel/cloud.cfg
-@@ -4,7 +4,7 @@ users:
- disable_root: 1
- ssh_pwauth:   0
- 
-mount_default_fields: [~, ~, 'auto', 'defaults,nofail,x-systemd.requires=cloud-init.service', '0', '2']
-+mount_default_fields: [~, ~, 'auto', 'defaults,nofail,x-systemd.requires=cloud-init.service,_netdev', '0', '2']
- resize_rootfs_tmp: /dev
- ssh_deletekeys:   1
- ssh_genkeytypes:  ~
-- 
-2.31.1
-
--- a/SOURCES/0003-Do-not-write-NM_CONTROLLED-no-in-generated-interface.patch
+++ b/SOURCES/0003-Do-not-write-NM_CONTROLLED-no-in-generated-interface.patch
@ -0,0 +1,550 @@
+From 2d3a22bd5b36c20b53f1604e9ff6ce05c98753ec Mon Sep 17 00:00:00 2001
+From: Cathy Avery <cavery@redhat.com>
+Date: Mon, 18 Dec 2023 12:54:16 -0500
+Subject: Do not write NM_CONTROLLED=no in generated interface config files
+
+Squashed from:
+    From 3ee57b044d2b85d8172961258d2edeab82a43772 Mon Sep 17 00:00:00 2001
+    From: Eduardo Otubo <otubo@redhat.com>
+    Date: Fri, 7 May 2021 13:36:06 +0200
+    Subject: [PATCH 02/12] Do not write NM_CONTROLLED=no in generated interface config files
+
+    From 3a070f23440c9eb6e0e5fb3605e36285e8a5b727 Mon Sep 17 00:00:00 2001
+    From: Ani Sinha <anisinha@redhat.com>
+    Date: Fri, 23 Jun 2023 16:54:24 +0530
+    Subject: [PATCH 27/51] test fixes: remove NM_CONTROLLED=no from tests
+    fixes: b3b96bff187e9 ("Do not write NM_CONTROLLED=no in generated interface config files")
+
+X-downstream-only: true
+
+Signed-off-by: Cathy Avery <cavery@redhat.com>
+---
+ cloudinit/net/sysconfig.py                    |  1 -
+ tests/unittests/cmd/devel/test_net_convert.py |  1 -
+ tests/unittests/distros/test_netconfig.py     |  8 ---
+ tests/unittests/test_net.py                   | 53 -------------------
+ 4 files changed, 63 deletions(-)
+
+diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
+index 7570a5e3..3b7a1f93 100644
+--- a/cloudinit/net/sysconfig.py
+++ b/cloudinit/net/sysconfig.py
+@@ -317,7 +317,6 @@ class Renderer(renderer.Renderer):
+         "rhel": {
+             "ONBOOT": True,
+             "USERCTL": False,
+-            "NM_CONTROLLED": False,
+             "BOOTPROTO": "none",
+         },
+         "suse": {"BOOTPROTO": "static", "STARTMODE": "auto"},
+diff --git a/tests/unittests/cmd/devel/test_net_convert.py b/tests/unittests/cmd/devel/test_net_convert.py
+index fb72963f..7b9121b2 100644
+--- a/tests/unittests/cmd/devel/test_net_convert.py
+++ b/tests/unittests/cmd/devel/test_net_convert.py
+@@ -62,7 +62,6 @@ SAMPLE_SYSCONFIG_CONTENT = """\
+ #
+ BOOTPROTO=dhcp
+ DEVICE=eth0
+-NM_CONTROLLED=no
+ ONBOOT=yes
+ TYPE=Ethernet
+ USERCTL=no
+diff --git a/tests/unittests/distros/test_netconfig.py b/tests/unittests/distros/test_netconfig.py
+index 7ba430f2..962ff7fb 100644
+--- a/tests/unittests/distros/test_netconfig.py
+++ b/tests/unittests/distros/test_netconfig.py
+@@ -723,7 +723,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
+                 GATEWAY=192.168.1.254
+                 IPADDR=192.168.1.5
+                 NETMASK=255.255.255.0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no
+@@ -733,7 +732,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
+                 """\
+                 BOOTPROTO=dhcp
+                 DEVICE=eth1
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no
+@@ -764,7 +762,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
+                 IPV6_AUTOCONF=no
+                 IPV6_DEFAULTGW=2607:f0d0:1002:0011::1
+                 IPV6_FORCE_ACCEPT_RA=no
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no
+@@ -774,7 +771,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
+                 """\
+                 BOOTPROTO=dhcp
+                 DEVICE=eth1
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no
+@@ -821,7 +817,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
+                 HWADDR=00:16:3e:60:7c:df
+                 IPADDR=192.10.1.2
+                 NETMASK=255.255.255.0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no
+@@ -833,7 +828,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
+                 DEVICE=infra0
+                 IPADDR=10.0.1.2
+                 NETMASK=255.255.0.0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 PHYSDEV=eth0
+                 USERCTL=no
+@@ -869,7 +863,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
+                 DEVICE=eth0
+                 IPADDR=192.10.1.2
+                 NETMASK=255.255.255.0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no
+@@ -881,7 +874,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
+                 DEVICE=eth0.1001
+                 IPADDR=10.0.1.2
+                 NETMASK=255.255.0.0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 PHYSDEV=eth0
+                 USERCTL=no
+diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
+index c5509536..052b0674 100644
+--- a/tests/unittests/test_net.py
+++ b/tests/unittests/test_net.py
+@@ -585,7 +585,6 @@ GATEWAY=172.19.3.254
+ HWADDR=fa:16:3e:ed:9a:59
+ IPADDR=172.19.1.34
+ NETMASK=255.255.252.0
+-NM_CONTROLLED=no
+ ONBOOT=yes
+ TYPE=Ethernet
+ USERCTL=no
+@@ -750,7 +749,6 @@ IPADDR=172.19.1.34
+ IPADDR1=10.0.0.10
+ NETMASK=255.255.252.0
+ NETMASK1=255.255.255.0
+-NM_CONTROLLED=no
+ ONBOOT=yes
+ TYPE=Ethernet
+ USERCTL=no
+@@ -912,7 +910,6 @@ IPV6_AUTOCONF=no
+ IPV6_DEFAULTGW=2001:DB8::1
+ IPV6_FORCE_ACCEPT_RA=no
+ NETMASK=255.255.252.0
+-NM_CONTROLLED=no
+ ONBOOT=yes
+ TYPE=Ethernet
+ USERCTL=no
+@@ -1143,7 +1140,6 @@ NETWORK_CONFIGS = {
+                 BOOTPROTO=none
+                 DEVICE=eth1
+                 HWADDR=cf:d6:af:48:e8:80
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no"""
+@@ -1162,7 +1158,6 @@ NETWORK_CONFIGS = {
+                 IPADDR=192.168.21.3
+                 NETMASK=255.255.255.0
+                 METRIC=10000
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no"""
+@@ -1319,7 +1314,6 @@ NETWORK_CONFIGS = {
+                 BOOTPROTO=none
+                 DEVICE=eth1
+                 HWADDR=cf:d6:af:48:e8:80
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no"""
+@@ -1338,7 +1332,6 @@ NETWORK_CONFIGS = {
+                 IPADDR=192.168.21.3
+                 NETMASK=255.255.255.0
+                 METRIC=10000
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no"""
+@@ -1581,7 +1574,6 @@ NETWORK_CONFIGS = {
+                 IPV6_AUTOCONF=no
+                 IPV6_FORCE_ACCEPT_RA=no
+                 NETMASK=255.255.255.0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no
+@@ -1725,7 +1717,6 @@ NETWORK_CONFIGS = {
+                 DHCPV6C=yes
+                 IPV6INIT=yes
+                 DEVICE=iface0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no
+@@ -1816,7 +1807,6 @@ NETWORK_CONFIGS = {
+                 IPV6INIT=yes
+                 IPV6_FORCE_ACCEPT_RA=yes
+                 DEVICE=iface0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no
+@@ -1892,7 +1882,6 @@ NETWORK_CONFIGS = {
+                 IPV6INIT=yes
+                 IPV6_FORCE_ACCEPT_RA=no
+                 DEVICE=iface0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no
+@@ -1956,7 +1945,6 @@ NETWORK_CONFIGS = {
+                 IPV6_AUTOCONF=yes
+                 IPV6INIT=yes
+                 DEVICE=iface0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no
+@@ -2014,7 +2002,6 @@ NETWORK_CONFIGS = {
+             IPV6_AUTOCONF=no
+             IPV6_FORCE_ACCEPT_RA=no
+             DEVICE=iface0
+-            NM_CONTROLLED=no
+             ONBOOT=yes
+             TYPE=Ethernet
+             USERCTL=no
+@@ -2071,7 +2058,6 @@ NETWORK_CONFIGS = {
+             IPV6_AUTOCONF=yes
+             IPV6INIT=yes
+             DEVICE=iface0
+-            NM_CONTROLLED=no
+             ONBOOT=yes
+             TYPE=Ethernet
+             USERCTL=no
+@@ -2157,7 +2143,6 @@ NETWORK_CONFIGS = {
+             IPV6_FAILURE_FATAL=yes
+             IPV6_FORCE_ACCEPT_RA=yes
+             DEVICE=iface0
+-            NM_CONTROLLED=no
+             ONBOOT=yes
+             TYPE=Ethernet
+             USERCTL=no
+@@ -2198,7 +2183,6 @@ NETWORK_CONFIGS = {
+                 """\
+                 BOOTPROTO=dhcp
+                 DEVICE=iface0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no
+@@ -2275,7 +2259,6 @@ NETWORK_CONFIGS = {
+                 BOOTPROTO=dhcp
+                 DEVICE=iface0
+                 ETHTOOL_OPTS="wol g"
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no
+@@ -2619,7 +2602,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+                 DHCPV6C=yes
+                 IPV6INIT=yes
+                 MACADDR=aa:bb:cc:dd:ee:ff
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Bond
+                 USERCTL=no"""
+@@ -2629,7 +2611,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+                 BOOTPROTO=dhcp
+                 DEVICE=bond0.200
+                 DHCLIENT_SET_DEFAULT_ROUTE=no
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 PHYSDEV=bond0
+                 USERCTL=no
+@@ -2649,7 +2630,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+                 IPV6_DEFAULTGW=2001:4800:78ff:1b::1
+                 MACADDR=bb:bb:bb:bb:bb:aa
+                 NETMASK=255.255.255.0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 PRIO=22
+                 STP=no
+@@ -2661,7 +2641,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+                 BOOTPROTO=none
+                 DEVICE=eth0
+                 HWADDR=c0:d6:9f:2c:e8:80
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no"""
+@@ -2680,7 +2659,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+                 MTU=1500
+                 NETMASK=255.255.255.0
+                 NETMASK1=255.255.255.0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 PHYSDEV=eth0
+                 USERCTL=no
+@@ -2692,7 +2670,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+                 DEVICE=eth1
+                 HWADDR=aa:d6:9f:2c:e8:80
+                 MASTER=bond0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 SLAVE=yes
+                 TYPE=Ethernet
+@@ -2704,7 +2681,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+                 DEVICE=eth2
+                 HWADDR=c0:bb:9f:2c:e8:80
+                 MASTER=bond0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 SLAVE=yes
+                 TYPE=Ethernet
+@@ -2716,7 +2692,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+                 BRIDGE=br0
+                 DEVICE=eth3
+                 HWADDR=66:bb:9f:2c:e8:80
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no"""
+@@ -2727,7 +2702,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+                 BRIDGE=br0
+                 DEVICE=eth4
+                 HWADDR=98:bb:9f:2c:e8:80
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no"""
+@@ -2738,7 +2712,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+                 DEVICE=eth5
+                 DHCLIENT_SET_DEFAULT_ROUTE=no
+                 HWADDR=98:bb:9f:2c:e8:8a
+-                NM_CONTROLLED=no
+                 ONBOOT=no
+                 TYPE=Ethernet
+                 USERCTL=no"""
+@@ -2751,7 +2724,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+                 IPADDR=192.168.200.7
+                 MTU=9000
+                 NETMASK=255.255.255.0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=InfiniBand
+                 USERCTL=no"""
+@@ -3473,7 +3445,6 @@ iface bond0 inet6 static
+         MTU=9000
+         NETMASK=255.255.255.0
+         NETMASK1=255.255.255.0
+-        NM_CONTROLLED=no
+         ONBOOT=yes
+         TYPE=Bond
+         USERCTL=no
+@@ -3485,7 +3456,6 @@ iface bond0 inet6 static
+         DEVICE=bond0s0
+         HWADDR=aa:bb:cc:dd:e8:00
+         MASTER=bond0
+-        NM_CONTROLLED=no
+         ONBOOT=yes
+         SLAVE=yes
+         TYPE=Ethernet
+@@ -3513,7 +3483,6 @@ iface bond0 inet6 static
+         DEVICE=bond0s1
+         HWADDR=aa:bb:cc:dd:e8:01
+         MASTER=bond0
+-        NM_CONTROLLED=no
+         ONBOOT=yes
+         SLAVE=yes
+         TYPE=Ethernet
+@@ -3662,7 +3631,6 @@ iface bond0 inet6 static
+                 BOOTPROTO=none
+                 DEVICE=en0
+                 HWADDR=aa:bb:cc:dd:e8:00
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no"""
+@@ -3683,7 +3651,6 @@ iface bond0 inet6 static
+                 MTU=2222
+                 NETMASK=255.255.255.0
+                 NETMASK1=255.255.255.0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 PHYSDEV=en0
+                 USERCTL=no
+@@ -3811,7 +3778,6 @@ iface bond0 inet6 static
+                 DEVICE=br0
+                 IPADDR=192.168.2.2
+                 NETMASK=255.255.255.0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 PRIO=22
+                 STP=no
+@@ -3829,7 +3795,6 @@ iface bond0 inet6 static
+                 IPV6INIT=yes
+                 IPV6_AUTOCONF=no
+                 IPV6_FORCE_ACCEPT_RA=no
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no
+@@ -3845,7 +3810,6 @@ iface bond0 inet6 static
+                 IPV6INIT=yes
+                 IPV6_AUTOCONF=no
+                 IPV6_FORCE_ACCEPT_RA=no
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no
+@@ -4030,7 +3994,6 @@ iface bond0 inet6 static
+                 HWADDR=52:54:00:12:34:00
+                 IPADDR=192.168.1.2
+                 NETMASK=255.255.255.0
+-                NM_CONTROLLED=no
+                 ONBOOT=no
+                 TYPE=Ethernet
+                 USERCTL=no
+@@ -4042,7 +4005,6 @@ iface bond0 inet6 static
+                 DEVICE=eth1
+                 HWADDR=52:54:00:12:34:aa
+                 MTU=1480
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no
+@@ -4053,7 +4015,6 @@ iface bond0 inet6 static
+                 BOOTPROTO=none
+                 DEVICE=eth2
+                 HWADDR=52:54:00:12:34:ff
+-                NM_CONTROLLED=no
+                 ONBOOT=no
+                 TYPE=Ethernet
+                 USERCTL=no
+@@ -4138,7 +4099,6 @@ iface bond0 inet6 static
+                 BOOTPROTO=none
+                 DEVICE=eth0
+                 HWADDR=cf:d6:af:48:e8:80
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no"""
+@@ -4736,7 +4696,6 @@ class TestRhelSysConfigRendering(CiTestCase):
+ BOOTPROTO=dhcp
+ DEVICE=eth1000
+ HWADDR=07-1c-c6-75-a4-be
+-NM_CONTROLLED=no
+ ONBOOT=yes
+ TYPE=Ethernet
+ USERCTL=no
+@@ -4948,7 +4907,6 @@ GATEWAY=10.0.2.2
+ HWADDR=52:54:00:12:34:00
+ IPADDR=10.0.2.15
+ NETMASK=255.255.255.0
+-NM_CONTROLLED=no
+ ONBOOT=yes
+ TYPE=Ethernet
+ USERCTL=no
+@@ -4979,7 +4937,6 @@ HWADDR=fa:16:3e:25:b4:59
+ IPADDR=51.68.89.122
+ MTU=1500
+ NETMASK=255.255.240.0
+-NM_CONTROLLED=no
+ ONBOOT=yes
+ TYPE=Ethernet
+ USERCTL=no
+@@ -4993,7 +4950,6 @@ DEVICE=eth1
+ DHCLIENT_SET_DEFAULT_ROUTE=no
+ HWADDR=fa:16:3e:b1:ca:29
+ MTU=9000
+-NM_CONTROLLED=no
+ ONBOOT=yes
+ TYPE=Ethernet
+ USERCTL=no
+@@ -5018,7 +4974,6 @@ USERCTL=no
+ #
+ BOOTPROTO=dhcp
+ DEVICE=eth0
+-NM_CONTROLLED=no
+ ONBOOT=yes
+ TYPE=Ethernet
+ USERCTL=no
+@@ -5251,7 +5206,6 @@ USERCTL=no
+                    IPV6_FORCE_ACCEPT_RA=no
+                    IPV6_DEFAULTGW=2001:db8::1
+                    NETMASK=255.255.255.0
+-                   NM_CONTROLLED=no
+                    ONBOOT=yes
+                    TYPE=Ethernet
+                    USERCTL=no
+@@ -5283,7 +5237,6 @@ USERCTL=no
+                 """\
+                 BOOTPROTO=none
+                 DEVICE=eno1
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no
+@@ -5296,7 +5249,6 @@ USERCTL=no
+                 IPADDR=192.6.1.9
+                 MTU=1495
+                 NETMASK=255.255.255.0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 PHYSDEV=eno1
+                 USERCTL=no
+@@ -5332,7 +5284,6 @@ USERCTL=no
+                 IPADDR=10.101.8.65
+                 MTU=1334
+                 NETMASK=255.255.255.192
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Bond
+                 USERCTL=no
+@@ -5344,7 +5295,6 @@ USERCTL=no
+                 BOOTPROTO=none
+                 DEVICE=enp0s0
+                 MASTER=bond0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 SLAVE=yes
+                 TYPE=Bond
+@@ -5357,7 +5307,6 @@ USERCTL=no
+                 BOOTPROTO=none
+                 DEVICE=enp0s1
+                 MASTER=bond0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 SLAVE=yes
+                 TYPE=Bond
+@@ -5388,7 +5337,6 @@ USERCTL=no
+                 DEVICE=eno1
+                 HWADDR=07-1c-c6-75-a4-be
+                 METRIC=100
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no
+@@ -5479,7 +5427,6 @@ USERCTL=no
+                 IPV6_FORCE_ACCEPT_RA=no
+                 MTU=1400
+                 NETMASK=255.255.248.0
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no
+-- 
+2.41.0
+
--- a/SOURCES/0004-Setting-highest-autoconnect-priority-for-network-scr.patch
+++ b/SOURCES/0004-Setting-highest-autoconnect-priority-for-network-scr.patch
@ -1,49 +0,0 @@
-From a14df44ffdc880ae16c691901e2671458ab234ff Mon Sep 17 00:00:00 2001
-From: Eduardo Otubo <otubo@redhat.com>
-Date: Thu, 17 Feb 2022 15:32:35 +0100
-Subject: 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
-
-Signed-off-by: Eduardo Otubo <otubo@redhat.com>
-
-patch_name: ci-Setting-highest-autoconnect-priority-for-network-scr.patch
-present_in_specfile: true
-location_in_specfile: 30
---
- cloudinit/net/sysconfig.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
-index d8c53312..b50035b5 100644
--- a/cloudinit/net/sysconfig.py
-+++ b/cloudinit/net/sysconfig.py
-@@ -337,6 +337,7 @@ class Renderer(renderer.Renderer):
-             "ONBOOT": True,
-             "USERCTL": False,
-             "BOOTPROTO": "none",
-+            "AUTOCONNECT_PRIORITY": 999
-         },
-         "suse": {"BOOTPROTO": "static", "STARTMODE": "auto"},
-     }
-- 
-2.31.1
-
--- a/SOURCES/0004-include-NOZEROCONF-yes-in-etc-sysconfig-network.patch
+++ b/SOURCES/0004-include-NOZEROCONF-yes-in-etc-sysconfig-network.patch
@ -0,0 +1,53 @@
+From fea3e7fc6d23e988cf4a33dc03064ff31bf1d72d Mon Sep 17 00:00:00 2001
+From: Eduardo Otubo <otubo@redhat.com>
+Date: Fri, 7 May 2021 13:36:13 +0200
+Subject: include 'NOZEROCONF=yes' in /etc/sysconfig/network
+
+RH-Author: Eduardo Otubo <otubo@redhat.com>
+Message-id: <20190320114559.23708-1-otubo@redhat.com>
+Patchwork-id: 84937
+O-Subject: [RHEL-7.7 cloud-init PATCH] include 'NOZEROCONF=yes' in /etc/sysconfig/network
+Bugzilla: 1653131
+RH-Acked-by: Cathy Avery <cavery@redhat.com>
+RH-Acked-by: Mohammed Gamal <mgamal@redhat.com>
+RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
+
+The option NOZEROCONF=yes is not included by default in
+/etc/sysconfig/network, which is required by Overcloud instances. The
+patch also includes tests for the modifications.
+
+X-downstream-only: yes
+Resolves: rhbz#1653131
+
+Signed-off-by: Eduardo Otubo <otubo@redhat.com>
+Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
+(cherry picked from commit ffa647e83efd4293bd027e9e390274aad8a12d94)
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+Signed-off-by: Cathy Avery <cavery@redhat.com>
+---
+ cloudinit/net/sysconfig.py | 11 ++++++++++-
+ redhat/scripts/frh.py      | 10 +++++++---
+ 2 files changed, 17 insertions(+), 4 deletions(-)
+
+diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
+index 3b7a1f93..f01c4236 100644
+--- a/cloudinit/net/sysconfig.py
+++ b/cloudinit/net/sysconfig.py
+@@ -1029,7 +1029,16 @@ class Renderer(renderer.Renderer):
+         # Distros configuring /etc/sysconfig/network as a file e.g. Centos
+         if sysconfig_path.endswith("network"):
+             util.ensure_dir(os.path.dirname(sysconfig_path))
+-            netcfg = [_make_header(), "NETWORKING=yes"]
+            netcfg = []
+            for line in util.load_file(sysconfig_path, quiet=True).split("\n"):
+                if "cloud-init" in line:
+                    break
+                if not line.startswith(
+                    ("NETWORKING=", "IPV6_AUTOCONF=", "NETWORKING_IPV6=")
+                ):
+                    netcfg.append(line)
+            # Now generate the cloud-init portion of sysconfig/network
+            netcfg.extend([_make_header(), "NETWORKING=yes"])
+             if network_state.use_ipv6:
+                 netcfg.append("NETWORKING_IPV6=yes")
+                 netcfg.append("IPV6_AUTOCONF=no")
--- a/SOURCES/0005-limit-permissions-on-def_log_file.patch
+++ b/SOURCES/0005-limit-permissions-on-def_log_file.patch
@ -1,69 +0,0 @@
-From 40ad855b883050069393b9c00db2a6d222d949db Mon Sep 17 00:00:00 2001
-From: Eduardo Otubo <otubo@redhat.com>
-Date: Fri, 7 May 2021 13:36:08 +0200
-Subject: limit permissions on def_log_file
-
-This sets a default mode of 0600 on def_log_file, and makes this
-configurable via the def_log_file_mode option in cloud.cfg.
-
-LP: #1541196
-Resolves: rhbz#1424612
-X-approved-upstream: true
-
-Conflicts 21.1:
-    cloudinit/stages.py: adjusting call of ensure_file() to use more
-recent version
-
-Signed-off-by: Eduardo Otubo <otubo@redhat.com>
---
- cloudinit/settings.py         | 1 +
- cloudinit/stages.py           | 1 +
- doc/examples/cloud-config.txt | 4 ++++
- 3 files changed, 6 insertions(+)
-
-diff --git a/cloudinit/settings.py b/cloudinit/settings.py
-index a780e21e..aa2d6b95 100644
--- a/cloudinit/settings.py
-+++ b/cloudinit/settings.py
-@@ -49,6 +49,7 @@ CFG_BUILTIN = {
-         "None",
-     ],
-     'def_log_file': '/var/log/cloud-init.log',
-+    'def_log_file_mode': 0o600,
-     'log_cfgs': [],
-     'mount_default_fields': [None, None, 'auto', 'defaults,nofail', '0', '2'],
-     'ssh_deletekeys': False,
-diff --git a/cloudinit/stages.py b/cloudinit/stages.py
-index 3f17294b..61db1dbd 100644
--- a/cloudinit/stages.py
-+++ b/cloudinit/stages.py
-@@ -205,6 +205,7 @@ class Init(object):
-     def _initialize_filesystem(self):
-         util.ensure_dirs(self._initial_subdirs())
-         log_file = util.get_cfg_option_str(self.cfg, "def_log_file")
-+        log_file_mode = util.get_cfg_option_int(self.cfg, "def_log_file_mode")
-         if log_file:
-             util.ensure_file(log_file, mode=0o640, preserve_mode=True)
-             perms = self.cfg.get("syslog_fix_perms")
-diff --git a/doc/examples/cloud-config.txt b/doc/examples/cloud-config.txt
-index a2b4a3fa..0ccf3147 100644
--- a/doc/examples/cloud-config.txt
-+++ b/doc/examples/cloud-config.txt
-@@ -414,10 +414,14 @@ timezone: US/Eastern
- # if syslog_fix_perms is a list, it will iterate through and use the
- # first pair that does not raise error.
- #
-+# 'def_log_file' will be created with mode 'def_log_file_mode', which
-+# is specified as a numeric value and defaults to 0600.
-+#
- # the default values are '/var/log/cloud-init.log' and 'syslog:adm'
- # the value of 'def_log_file' should match what is configured in logging
- # if either is empty, then no change of ownership will be done
- def_log_file: /var/log/my-logging-file.log
-+def_log_file_mode: 0600
- syslog_fix_perms: syslog:root
- 
- # you can set passwords for a user or multiple users
-- 
-2.31.1
-
--- a/SOURCES/0005-settings.py-update-settings-for-rhel.patch
+++ b/SOURCES/0005-settings.py-update-settings-for-rhel.patch
@ -0,0 +1,83 @@
+From f7236c817aee8c39223cca88deb8341b4f2b5dfa Mon Sep 17 00:00:00 2001
+From: Cathy Avery <cavery@redhat.com>
+Date: Mon, 18 Dec 2023 14:13:19 -0500
+Subject: settings.py: update settings for rhel
+
+    commit 2bf34313f2e9599e3304b5446411b5ada6ccd7f0
+    Author: Ani Sinha <anisinha@redhat.com>
+    Date:   Tue Apr 11 04:20:00 2023 -0400
+    Please see commit 5e1e568d7085fd4443
+
+(" Add initial redhat setup")
+from rhel8.8.0 branch for setings.py. Applying the same for the rebased
+cloud-init.
+
+X-downstream-only: true
+
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+
+Conflicts: "def_log_file_mode": 0o600 as commit
+130899115 'limit permissions on def_log_file' was not applied.
+
+Signed-off-by: Cathy Avery <cavery@redhat.com>
+---
+ cloudinit/settings.py            |  7 +++++--
+ tests/unittests/cmd/test_main.py | 17 +++++++++++------
+ 2 files changed, 16 insertions(+), 8 deletions(-)
+
+diff --git a/cloudinit/settings.py b/cloudinit/settings.py
+index 592e144d..87829ff0 100644
+--- a/cloudinit/settings.py
+++ b/cloudinit/settings.py
+@@ -54,13 +54,16 @@ CFG_BUILTIN = {
+     ],
+     "def_log_file": "/var/log/cloud-init.log",
+     "log_cfgs": [],
+-    "syslog_fix_perms": ["syslog:adm", "root:adm", "root:wheel", "root:root"],
+    "syslog_fix_perms": [],
+    "mount_default_fields": [None, None, "auto", "defaults,nofail", "0", "2"],
+    "ssh_deletekeys": False,
+    "ssh_genkeytypes": [],
+     "system_info": {
+         "paths": {
+             "cloud_dir": "/var/lib/cloud",
+             "templates_dir": "/etc/cloud/templates/",
+         },
+-        "distro": "ubuntu",
+        "distro": "rhel",
+         "network": {"renderers": None},
+     },
+     "vendor_data": {"enabled": True, "prefix": []},
+diff --git a/tests/unittests/cmd/test_main.py b/tests/unittests/cmd/test_main.py
+index ab427115..c8c2ae81 100644
+--- a/tests/unittests/cmd/test_main.py
+++ b/tests/unittests/cmd/test_main.py
+@@ -119,14 +119,19 @@ class TestMain(FilesystemMockingTestCase):
+                 {
+                     "def_log_file": "/var/log/cloud-init.log",
+                     "log_cfgs": [],
+-                    "syslog_fix_perms": [
+-                        "syslog:adm",
+-                        "root:adm",
+-                        "root:wheel",
+-                        "root:root",
+-                    ],
+                     "vendor_data": {"enabled": True, "prefix": []},
+                     "vendor_data2": {"enabled": True, "prefix": []},
+                    "syslog_fix_perms": [],
+                    "ssh_deletekeys": False,
+                    "ssh_genkeytypes": [],
+                    "mount_default_fields": [
+                        None,
+                        None,
+                        "auto",
+                        "defaults,nofail",
+                        "0",
+                        "2",
+                    ],
+                 }
+             )
+             updated_cfg.pop("system_info")
+-- 
+2.41.0
+
--- a/SOURCES/0006-rhel-cloud.cfg-remove-ssh_genkeytypes-in-settings.py.patch
+++ b/SOURCES/0006-rhel-cloud.cfg-remove-ssh_genkeytypes-in-settings.py.patch
@ -1,65 +0,0 @@
-From 00f1f910d8d166ebe2913c12549f212c2d666c11 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: 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>
---
- cloudinit/settings.py | 2 --
- rhel/cloud.cfg        | 2 +-
- 2 files changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/cloudinit/settings.py b/cloudinit/settings.py
-index aa2d6b95..38a90b70 100644
--- a/cloudinit/settings.py
-+++ b/cloudinit/settings.py
-@@ -52,8 +52,6 @@ CFG_BUILTIN = {
-     'def_log_file_mode': 0o600,
-     'log_cfgs': [],
-     'mount_default_fields': [None, None, 'auto', 'defaults,nofail', '0', '2'],
-    'ssh_deletekeys': False,
-    'ssh_genkeytypes': [],
-     'syslog_fix_perms': [],
-     'system_info': {
-         'paths': {
-diff --git a/rhel/cloud.cfg b/rhel/cloud.cfg
-index 1ec1a6c6..75d5c84b 100644
--- a/rhel/cloud.cfg
-+++ b/rhel/cloud.cfg
-@@ -7,7 +7,7 @@ ssh_pwauth:   0
- mount_default_fields: [~, ~, 'auto', 'defaults,nofail,x-systemd.requires=cloud-init.service,_netdev', '0', '2']
- resize_rootfs_tmp: /dev
- ssh_deletekeys:   1
-ssh_genkeytypes:  ~
-+ssh_genkeytypes:  ['rsa', 'ecdsa', 'ed25519']
- syslog_fix_perms: ~
- disable_vmware_customization: false
- 
-- 
-2.31.1
-
--- 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
@ -0,0 +1,98 @@
+From 77585bbc6d01399ff88865b55dfb7a47b8640271 Mon Sep 17 00:00:00 2001
+From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+Date: Thu, 20 May 2021 08:53:55 +0200
+Subject: rhel/cloud.cfg: remove ssh_genkeytypes in settings.py and set in
+ cloud.cfg
+
+RH-Author: Ani Sinha <None>
+RH-MergeRequest: 113: rhel/cloud.cfg: remove ssh_genkeytypes in settings.py and set in cloud.cfg
+RH-Jira: RHEL-16572
+RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Commit: [1/1] f506bf58dc5458f50624342ec33bcd390aa0b719 (anisinha/rhel-cloud-init)
+
+RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-MergeRequest: 10: rhel/cloud.cfg: remove ssh_genkeytypes in settings.py and set in cloud.cfg
+RH-Commit: [1/1] 6da989423b9b6e017afbac2f1af3649b0487310f
+RH-Bugzilla: 1957532
+RH-Acked-by: Eduardo Otubo <otubo@redhat.com>
+RH-Acked-by: Cathy Avery <cavery@redhat.com>
+RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
+RH-Acked-by: Mohamed Gamal Morsy <mmorsy@redhat.com>
+
+Currently genkeytypes in cloud.cfg is set to None, so together with
+ssh_deletekeys=1 cloudinit on first boot it will just delete the existing
+keys and not generate new ones.
+
+Just removing that property in cloud.cfg is not enough, because
+settings.py provides another empty default value that will be used
+instead, resulting to no key generated even when the property is not defined.
+
+Removing genkeytypes also in settings.py will default to GENERATE_KEY_NAMES,
+but since we want only 'rsa', 'ecdsa' and 'ed25519', add back genkeytypes in
+cloud.cfg with the above defaults.
+
+Also remove ssh_deletekeys in settings.py as we always need
+to 1 (and it also defaults to 1).
+
+Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+(cherry picked from commit b545a0cbabe8924d048b7172b30e7aad59ed32d5)
+(cherry picked from commit 855dec5dcc0892c0f7cedf06b025a794769a2a8d)
+
+Fix unit test breakage
+
+Fix unit test breakage due to the downstream change
+5d6674508c6478fa2c ("rhel/cloud.cfg: remove ssh_genkeytypes in settings.py and set in cloud.cfg")
+
+X-downstream-only: true
+Fixes: 5d6674508c6478fa2c ("rhel/cloud.cfg: remove ssh_genkeytypes in settings.py and set in cloud.cfg")
+
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+
+Squashed:
+    commit 1afec9e6008db187d1b675e4473d5a2bf0b3c36b
+    Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+    Date:   Thu May 20 08:53:55 2021 +0200
+    Subject: [PATCH 49/51] rhel/cloud.cfg: remove ssh_genkeytypes in settings.py
+             and set in cloud.cfg
+
+    From fe6fb1843fe8df75899fe189b9e5f8ce3cd75be1 Mon Sep 17 00:00:00 2001
+    From: Ani Sinha <anisinha@redhat.com>
+    Date: Fri, 8 Dec 2023 12:50:15 +0530
+    Subject: [PATCH 51/51] Fix unit test breakage
+
+Signed-off-by: Cathy Avery <cavery@redhat.com>
+---
+ cloudinit/settings.py            | 2 --
+ tests/unittests/cmd/test_main.py | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/cloudinit/settings.py b/cloudinit/settings.py
+index 87829ff0..3a581e5b 100644
+--- a/cloudinit/settings.py
+++ b/cloudinit/settings.py
+@@ -56,8 +56,6 @@ CFG_BUILTIN = {
+     "log_cfgs": [],
+     "syslog_fix_perms": [],
+     "mount_default_fields": [None, None, "auto", "defaults,nofail", "0", "2"],
+-    "ssh_deletekeys": False,
+-    "ssh_genkeytypes": [],
+     "system_info": {
+         "paths": {
+             "cloud_dir": "/var/lib/cloud",
+diff --git a/tests/unittests/cmd/test_main.py b/tests/unittests/cmd/test_main.py
+index c8c2ae81..19d26ebe 100644
+--- a/tests/unittests/cmd/test_main.py
+++ b/tests/unittests/cmd/test_main.py
+@@ -122,8 +122,6 @@ class TestMain(FilesystemMockingTestCase):
+                     "vendor_data": {"enabled": True, "prefix": []},
+                     "vendor_data2": {"enabled": True, "prefix": []},
+                     "syslog_fix_perms": [],
+-                    "ssh_deletekeys": False,
+-                    "ssh_genkeytypes": [],
+                     "mount_default_fields": [
+                         None,
+                         None,
+-- 
+2.41.0
+
--- a/SOURCES/ci-Add-native-NetworkManager-support-1224.patch
+++ b/SOURCES/ci-Add-native-NetworkManager-support-1224.patch
--- a/SOURCES/ci-Align-rhel-custom-files-with-upstream-1431.patch
+++ b/SOURCES/ci-Align-rhel-custom-files-with-upstream-1431.patch
@ -1,256 +0,0 @@
-From 8e599c618ba33f7ed572f752fc9201ca44e41868 Mon Sep 17 00:00:00 2001
-From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-Date: Wed, 18 May 2022 16:21:45 +0200
-Subject: [PATCH 4/5] Align rhel custom files with upstream (#1431)
-
-RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-RH-MergeRequest: 26: Align rhel custom files with upstream (#1431)
-RH-Commit: [1/2] edac80c4fa3a11d093ee0e7260796566a7eb141e (eesposit/cloud-init-centos-)
-RH-Bugzilla: 2088448
-RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-
-commit 9624758f91b61f4711e8d7b5c83075b5d23e0c43
-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-Date:   Wed May 18 15:18:04 2022 +0200
-
-    Align rhel custom files with upstream (#1431)
-
-    So far RHEL had its own custom .service and cloud.cfg files,
-    that diverged from upstream. We always replaced the generated files
-    with the ones we had.
-
-    This caused only confusion and made it harder to rebase and backport
-    patches targeting these files.
-    At the same time, we are going to delete our custom downstream-only files
-    and use the ones generated by .tmpl.
-
-    The mapping is:
-    config/cloud.cfg.tmpl -> rhel/cloud.cfg
-    systemd/* -> rhel/systemd/*
-
-    Such rhel-specific files are open and available in the Centos repo:
-    https://gitlab.com/redhat/centos-stream/src/cloud-init
-
-    With this commit, we are also introducing modules in cloud.cfg that
-    were not in the default rhel cfg file, even though they should already
-    have been there with previous rebases and releases.
-    Anyways such modules support rhel as distro, and
-    therefore should cause no harm.
-
-    Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-
-    RHBZ: 2082071
-
-Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
---
- config/cloud.cfg.tmpl                   | 23 +++++++++++++++++++++++
- systemd/cloud-config.service.tmpl       |  4 ++++
- systemd/cloud-final.service.tmpl        | 13 +++++++++++++
- systemd/cloud-init-local.service.tmpl   | 22 +++++++++++++++++++++-
- systemd/cloud-init.service.tmpl         |  6 +++++-
- tests/unittests/test_render_cloudcfg.py |  1 +
- 6 files changed, 67 insertions(+), 2 deletions(-)
-
-diff --git a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl
-index 86beee3c..f4d2fd14 100644
--- a/config/cloud.cfg.tmpl
-+++ b/config/cloud.cfg.tmpl
-@@ -34,7 +34,11 @@ disable_root: true
- 
- {% if variant in ["almalinux", "alpine", "amazon", "centos", "cloudlinux", "eurolinux",
-                   "fedora", "miraclelinux", "openEuler", "rhel", "rocky", "virtuozzo"] %}
-+{% if variant == "rhel" %}
-+mount_default_fields: [~, ~, 'auto', 'defaults,nofail,x-systemd.requires=cloud-init.service,_netdev', '0', '2']
-+{% else %}
- mount_default_fields: [~, ~, 'auto', 'defaults,nofail', '0', '2']
-+{% endif %}
- {% if variant == "amazon" %}
- resize_rootfs: noblock
- {% endif %}
-@@ -66,6 +70,14 @@ network:
-   config: disabled
- {% endif %}
- 
-+{% if variant == "rhel" %}
-+# Default redhat settings:
-+ssh_deletekeys:   true
-+ssh_genkeytypes:  ['rsa', 'ecdsa', 'ed25519']
-+syslog_fix_perms: ~
-+disable_vmware_customization: false
-+{% endif %}
-+
- # The modules that run in the 'init' stage
- cloud_init_modules:
-  - migrator
-@@ -107,10 +119,15 @@ cloud_config_modules:
- {% endif %}
- {% if variant not in ["photon"] %}
-  - ssh-import-id
-+{% if variant not in ["rhel"] %}
-  - keyboard
-+{% endif %}
-  - locale
- {% endif %}
-  - set-passwords
-+{% if variant in ["rhel"] %}
-+ - rh_subscription
-+{% endif %}
- {% if variant in ["rhel", "fedora", "photon"] %}
- {% if variant not in ["photon"] %}
-  - spacewalk
-@@ -239,6 +256,10 @@ system_info:
-      name: ec2-user
-      lock_passwd: True
-      gecos: EC2 Default User
-+{% elif variant == "rhel" %}
-+     name: cloud-user
-+     lock_passwd: true
-+     gecos: Cloud User
- {% else %}
-      name: {{ variant }}
-      lock_passwd: True
-@@ -254,6 +275,8 @@ system_info:
-      groups: [adm, sudo]
- {% elif variant == "arch" %}
-      groups: [wheel, users]
-+{% elif variant == "rhel" %}
-+     groups: [adm, systemd-journal]
- {% else %}
-      groups: [wheel, adm, systemd-journal]
- {% endif %}
-diff --git a/systemd/cloud-config.service.tmpl b/systemd/cloud-config.service.tmpl
-index 9d928ca2..d5568a6e 100644
--- a/systemd/cloud-config.service.tmpl
-+++ b/systemd/cloud-config.service.tmpl
-@@ -4,6 +4,10 @@ Description=Apply the settings specified in cloud-config
- After=network-online.target cloud-config.target
- After=snapd.seeded.service
- Wants=network-online.target cloud-config.target
-+{% if variant == "rhel" %}
-+ConditionPathExists=!/etc/cloud/cloud-init.disabled
-+ConditionKernelCommandLine=!cloud-init=disabled
-+{% endif %}
- 
- [Service]
- Type=oneshot
-diff --git a/systemd/cloud-final.service.tmpl b/systemd/cloud-final.service.tmpl
-index 8207b18c..85f423ac 100644
--- a/systemd/cloud-final.service.tmpl
-+++ b/systemd/cloud-final.service.tmpl
-@@ -7,6 +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
-+{% endif %}
- 
- 
- [Service]
-@@ -15,7 +19,16 @@ ExecStart=/usr/bin/cloud-init modules --mode=final
- RemainAfterExit=yes
- TimeoutSec=0
- KillMode=process
-+{% if variant == "rhel" %}
-+# Restart NetworkManager if it is present and running.
-+ExecStartPost=/bin/sh -c 'u=NetworkManager.service; \
-+ out=$(systemctl show --property=SubState $u) || exit; \
-+ [ "$out" = "SubState=running" ] || exit 0; \
-+ systemctl reload-or-try-restart $u'
-+{% else %}
- TasksMax=infinity
-+{% endif %}
-+
- 
- # Output needs to appear in instance console output
- StandardOutput=journal+console
-diff --git a/systemd/cloud-init-local.service.tmpl b/systemd/cloud-init-local.service.tmpl
-index 7166f640..a6b82650 100644
--- a/systemd/cloud-init-local.service.tmpl
-+++ b/systemd/cloud-init-local.service.tmpl
-@@ -1,23 +1,43 @@
- ## template:jinja
- [Unit]
- Description=Initial cloud-init job (pre-networking)
-{% if variant in ["ubuntu", "unknown", "debian"] %}
-+{% if variant in ["ubuntu", "unknown", "debian", "rhel" ] %}
- DefaultDependencies=no
- {% endif %}
- Wants=network-pre.target
- After=hv_kvp_daemon.service
- After=systemd-remount-fs.service
-+{% if variant == "rhel" %}
-+Requires=dbus.socket
-+After=dbus.socket
-+{% endif %}
- Before=NetworkManager.service
-+{% if variant == "rhel" %}
-+Before=network.service
-+{% endif %}
- Before=network-pre.target
- Before=shutdown.target
-+{% if variant == "rhel" %}
-+Before=firewalld.target
-+Conflicts=shutdown.target
-+{% endif %}
- {% if variant in ["ubuntu", "unknown", "debian"] %}
- Before=sysinit.target
- Conflicts=shutdown.target
- {% endif %}
- RequiresMountsFor=/var/lib/cloud
-+{% if variant == "rhel" %}
-+ConditionPathExists=!/etc/cloud/cloud-init.disabled
-+ConditionKernelCommandLine=!cloud-init=disabled
-+{% endif %}
- 
- [Service]
- Type=oneshot
-+{% if variant == "rhel" %}
-+ExecStartPre=/bin/mkdir -p /run/cloud-init
-+ExecStartPre=/sbin/restorecon /run/cloud-init
-+ExecStartPre=/usr/bin/touch /run/cloud-init/enabled
-+{% endif %}
- ExecStart=/usr/bin/cloud-init init --local
- ExecStart=/bin/touch /run/cloud-init/network-config-ready
- RemainAfterExit=yes
-diff --git a/systemd/cloud-init.service.tmpl b/systemd/cloud-init.service.tmpl
-index e71e5679..c170aef7 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"] %}
-+{% if variant not in ["photon", "rhel"] %}
- DefaultDependencies=no
- {% endif %}
- Wants=cloud-init-local.service
-@@ -36,6 +36,10 @@ Before=shutdown.target
- Conflicts=shutdown.target
- {% endif %}
- Before=systemd-user-sessions.service
-+{% if variant == "rhel" %}
-+ConditionPathExists=!/etc/cloud/cloud-init.disabled
-+ConditionKernelCommandLine=!cloud-init=disabled
-+{% endif %}
- 
- [Service]
- Type=oneshot
-diff --git a/tests/unittests/test_render_cloudcfg.py b/tests/unittests/test_render_cloudcfg.py
-index 30fbd1a4..9f95d448 100644
--- a/tests/unittests/test_render_cloudcfg.py
-+++ b/tests/unittests/test_render_cloudcfg.py
-@@ -68,6 +68,7 @@ class TestRenderCloudCfg:
-         default_user_exceptions = {
-             "amazon": "ec2-user",
-             "debian": "ubuntu",
-+            "rhel": "cloud-user",
-             "unknown": "ubuntu",
-         }
-         default_user = system_cfg["system_info"]["default_user"]["name"]
-- 
-2.31.1
-
--- a/SOURCES/ci-Ensure-network-ready-before-cloud-init-service-runs-.patch
+++ b/SOURCES/ci-Ensure-network-ready-before-cloud-init-service-runs-.patch
@ -1,43 +0,0 @@
-From 799ef819e75bdddbf4e983e6990a6a6a51c61bdb Mon Sep 17 00:00:00 2001
-From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-Date: Wed, 14 Dec 2022 09:21:32 +0100
-Subject: [PATCH] Ensure network ready before cloud-init service runs on RHEL
- (#1893)
-
-RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-RH-MergeRequest: 85: Ensure network ready before cloud-init service runs on RHEL (#1893)
-RH-Bugzilla: 2153183
-RH-Acked-by: Mohamed Gamal Morsy <mmorsy@redhat.com>
-RH-Acked-by: Camilla Conte <cconte@redhat.com>
-RH-Commit: [1/1] d1abf2692aeddea9eac69f6ff8b173e188c3e013
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2153183
-
-commit 6e725f36647407d201af0603d7db11fc96a93d4d
-Author: James Falcon <james.falcon@canonical.com>
-Date:   Tue Dec 13 10:55:23 2022 -0600
-
-    Ensure network ready before cloud-init service runs on RHEL (#1893)
-
-    LP: #1998655
-
-Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
---
- systemd/cloud-init.service.tmpl | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/systemd/cloud-init.service.tmpl b/systemd/cloud-init.service.tmpl
-index c170aef7..fc984d5c 100644
--- a/systemd/cloud-init.service.tmpl
-+++ b/systemd/cloud-init.service.tmpl
-@@ -16,6 +16,7 @@ After=networking.service
-                   "miraclelinux", "openEuler", "rhel", "rocky", "virtuozzo"] %}
- After=network.service
- After=NetworkManager.service
-+After=NetworkManager-wait-online.service
- {% endif %}
- {% if variant in ["suse"] %}
- After=wicked.service
-- 
-2.38.1
-
--- a/SOURCES/ci-Honor-system-locale-for-RHEL-1355.patch
+++ b/SOURCES/ci-Honor-system-locale-for-RHEL-1355.patch
@ -1,135 +0,0 @@
-From 53e3f8ab9008fec8400f96918c2129f7defe6a70 Mon Sep 17 00:00:00 2001
-From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-Date: Fri, 10 Jun 2022 20:51:55 +0200
-Subject: [PATCH 1/3] Honor system locale for RHEL (#1355)
-
-RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-RH-MergeRequest: 29: Honor system locale for RHEL (#1355)
-RH-Commit: [1/1] d571126fe6add8dc34a22c869d4e1a07a7373d8d (eesposit/cloud-init-centos-)
-RH-Bugzilla: 2061604
-RH-Acked-by: Mohamed Gamal Morsy <mmorsy@redhat.com>
-RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
-
-commit 58da7d856274e9ca2b507128d6f186e0e6abfe06
-Author: Wei Shi <wshi@redhat.com>
-Date:   Wed Mar 30 23:55:30 2022 +0800
-
-    Honor system locale for RHEL (#1355)
-
-    Make sure to use system locale as default on RHEL if locale is not
-    set in cloud-config.
-
-    RHEL has a pre-installed cloud image using C.UTF-8 for system locale
-    just like ubuntu-minimal cloud image, without this patch, locale
-    module will set it to en_US.UTF-8 from ds default value during config
-    stage.
-
-    Authored-by: Wei Shi <shi2wei3@hotmail.com>
-
-Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
---
- cloudinit/distros/rhel.py               | 32 +++++++++++++++++++++++++
- tests/unittests/distros/test_generic.py | 10 ++++----
- tools/.github-cla-signers               |  1 +
- 3 files changed, 39 insertions(+), 4 deletions(-)
-
-diff --git a/cloudinit/distros/rhel.py b/cloudinit/distros/rhel.py
-index 84744ece..320f4ba1 100644
--- a/cloudinit/distros/rhel.py
-+++ b/cloudinit/distros/rhel.py
-@@ -7,6 +7,7 @@
- # Author: Joshua Harlow <harlowja@yahoo-inc.com>
- #
- # This file is part of cloud-init. See LICENSE file for license information.
-+import os
- 
- from cloudinit import distros, helpers
- from cloudinit import log as logging
-@@ -57,11 +58,25 @@ class Distro(distros.Distro):
-         # should only happen say once per instance...)
-         self._runner = helpers.Runners(paths)
-         self.osfamily = "redhat"
-+        self.default_locale = "en_US.UTF-8"
-+        self.system_locale = None
-         cfg["ssh_svcname"] = "sshd"
- 
-     def install_packages(self, pkglist):
-         self.package_command("install", pkgs=pkglist)
- 
-+    def get_locale(self):
-+        """Return the default locale if set, else use system locale"""
-+
-+        # read system locale value
-+        if not self.system_locale:
-+            self.system_locale = self._read_system_locale()
-+
-+        # Return system_locale setting if valid, else use default locale
-+        return (
-+            self.system_locale if self.system_locale else self.default_locale
-+        )
-+
-     def apply_locale(self, locale, out_fn=None):
-         if self.uses_systemd():
-             if not out_fn:
-@@ -75,6 +90,23 @@ class Distro(distros.Distro):
-         }
-         rhel_util.update_sysconfig_file(out_fn, locale_cfg)
- 
-+    def _read_system_locale(self, keyname="LANG"):
-+        """Read system default locale setting, if present"""
-+        if self.uses_systemd():
-+            locale_fn = self.systemd_locale_conf_fn
-+        else:
-+            locale_fn = self.locale_conf_fn
-+
-+        if not locale_fn:
-+            raise ValueError("Invalid path: %s" % locale_fn)
-+
-+        if os.path.exists(locale_fn):
-+            (_exists, contents) = rhel_util.read_sysconfig_file(locale_fn)
-+            if keyname in contents:
-+                return contents[keyname]
-+            else:
-+                return None
-+
-     def _write_hostname(self, hostname, filename):
-         # systemd will never update previous-hostname for us, so
-         # we need to do it ourselves
-diff --git a/tests/unittests/distros/test_generic.py b/tests/unittests/distros/test_generic.py
-index 93c5395c..fedc7300 100644
--- a/tests/unittests/distros/test_generic.py
-+++ b/tests/unittests/distros/test_generic.py
-@@ -187,12 +187,14 @@ class TestGenericDistro(helpers.FilesystemMockingTestCase):
-         locale = d.get_locale()
-         self.assertEqual("C.UTF-8", locale)
- 
-    def test_get_locale_rhel(self):
-        """Test rhel distro returns NotImplementedError exception"""
-+    @mock.patch("cloudinit.distros.rhel.Distro._read_system_locale")
-+    def test_get_locale_rhel(self, m_locale):
-+        """Test rhel distro returns locale set to C.UTF-8"""
-+        m_locale.return_value = "C.UTF-8"
-         cls = distros.fetch("rhel")
-         d = cls("rhel", {}, None)
-        with self.assertRaises(NotImplementedError):
-            d.get_locale()
-+        locale = d.get_locale()
-+        self.assertEqual("C.UTF-8", locale)
- 
-     def test_expire_passwd_uses_chpasswd(self):
-         """Test ubuntu.expire_passwd uses the passwd command."""
-diff --git a/tools/.github-cla-signers b/tools/.github-cla-signers
-index 9f71ea0c..9eb2ae38 100644
--- a/tools/.github-cla-signers
-+++ b/tools/.github-cla-signers
-@@ -70,6 +70,7 @@ renanrodrigo
- rhansen
- riedel
- sarahwzadara
-+shi2wei3
- slingamn
- slyon
- smoser
-- 
-2.35.1
-
--- a/SOURCES/ci-Remove-rhel-specific-files.patch
+++ b/SOURCES/ci-Remove-rhel-specific-files.patch
@ -1,370 +0,0 @@
-From 0ae221fe8f29555370520d05f6558eb75fe3cd42 Mon Sep 17 00:00:00 2001
-From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-Date: Thu, 5 May 2022 11:31:33 +0200
-Subject: [PATCH 5/5] Remove rhel specific files
-
-RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-RH-MergeRequest: 26: Align rhel custom files with upstream (#1431)
-RH-Commit: [2/2] 0b9687ebab4f4039d5bbe05c00806ec7923e898d (eesposit/cloud-init-centos-)
-RH-Bugzilla: 2088448
-RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-
-Remove all files in rhel/ directory and related commands that copy
-and replace them with the generated ones.
-
-Also adjust setup.py, align it with upstream:
- by default, after rhel 8.3 ds-identify is in /usr/libexec, so no need to move it manually
- bash-completions work also in /usr/share, as upstream
- udev also works in /lib/udev
-
-Also remove rhel/README since it is outdated (chef is used in cloud.cfg) and cloud-init-tmpfiles.conf,
-as it exists also in .distro.
-
-X-downstream-only: yes
-
-Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
---
- rhel/README.rhel                      |  5 --
- rhel/cloud-init-tmpfiles.conf         |  1 -
- rhel/cloud.cfg                        | 69 ---------------------------
- rhel/systemd/cloud-config.service     | 18 -------
- rhel/systemd/cloud-config.target      | 11 -----
- rhel/systemd/cloud-final.service      | 24 ----------
- rhel/systemd/cloud-init-local.service | 31 ------------
- rhel/systemd/cloud-init.service       | 26 ----------
- rhel/systemd/cloud-init.target        |  7 ---
- setup.py                              | 28 ++++++++++-
- 11 files changed, 31 insertions(+), 210 deletions(-)
- delete mode 100644 rhel/README.rhel
- delete mode 100644 rhel/cloud-init-tmpfiles.conf
- delete mode 100644 rhel/cloud.cfg
- delete mode 100644 rhel/systemd/cloud-config.service
- delete mode 100644 rhel/systemd/cloud-config.target
- delete mode 100644 rhel/systemd/cloud-final.service
- delete mode 100644 rhel/systemd/cloud-init-local.service
- delete mode 100644 rhel/systemd/cloud-init.service
- delete mode 100644 rhel/systemd/cloud-init.target
-
-diff --git a/rhel/README.rhel b/rhel/README.rhel
-deleted file mode 100644
-index aa29630d..00000000
--- a/rhel/README.rhel
-+++ /dev/null
-@@ -1,5 +0,0 @@
-The following cloud-init modules are currently unsupported on this OS:
- - apt_update_upgrade ('apt_update', 'apt_upgrade', 'apt_mirror', 'apt_preserve_sources_list', 'apt_old_mirror', 'apt_sources', 'debconf_selections', 'packages' options)
- - byobu ('byobu_by_default' option)
- - chef
- - grub_dpkg
-diff --git a/rhel/cloud-init-tmpfiles.conf b/rhel/cloud-init-tmpfiles.conf
-deleted file mode 100644
-index 0c6d2a3b..00000000
--- a/rhel/cloud-init-tmpfiles.conf
-+++ /dev/null
-@@ -1 +0,0 @@
-d /run/cloud-init 0700 root root - -
-diff --git a/rhel/cloud.cfg b/rhel/cloud.cfg
-deleted file mode 100644
-index 75d5c84b..00000000
--- a/rhel/cloud.cfg
-+++ /dev/null
-@@ -1,69 +0,0 @@
-users:
- - default
-
-disable_root: 1
-ssh_pwauth:   0
-
-mount_default_fields: [~, ~, 'auto', 'defaults,nofail,x-systemd.requires=cloud-init.service,_netdev', '0', '2']
-resize_rootfs_tmp: /dev
-ssh_deletekeys:   1
-ssh_genkeytypes:  ['rsa', 'ecdsa', 'ed25519']
-syslog_fix_perms: ~
-disable_vmware_customization: false
-
-cloud_init_modules:
- - disk_setup
- - migrator
- - bootcmd
- - write-files
- - growpart
- - resizefs
- - set_hostname
- - update_hostname
- - update_etc_hosts
- - rsyslog
- - users-groups
- - ssh
-
-cloud_config_modules:
- - mounts
- - locale
- - set-passwords
- - rh_subscription
- - yum-add-repo
- - package-update-upgrade-install
- - timezone
- - puppet
- - chef
- - salt-minion
- - mcollective
- - disable-ec2-metadata
- - runcmd
-
-cloud_final_modules:
- - rightscale_userdata
- - scripts-per-once
- - scripts-per-boot
- - scripts-per-instance
- - scripts-user
- - ssh-authkey-fingerprints
- - keys-to-console
- - phone-home
- - final-message
- - power-state-change
-
-system_info:
-  default_user:
-    name: cloud-user
-    lock_passwd: true
-    gecos: Cloud User
-    groups: [adm, systemd-journal]
-    sudo: ["ALL=(ALL) NOPASSWD:ALL"]
-    shell: /bin/bash
-  distro: rhel
-  paths:
-    cloud_dir: /var/lib/cloud
-    templates_dir: /etc/cloud/templates
-  ssh_svcname: sshd
-
-# vim:syntax=yaml
-diff --git a/rhel/systemd/cloud-config.service b/rhel/systemd/cloud-config.service
-deleted file mode 100644
-index f3dcd4be..00000000
--- a/rhel/systemd/cloud-config.service
-+++ /dev/null
-@@ -1,18 +0,0 @@
-[Unit]
-Description=Apply the settings specified in cloud-config
-After=network-online.target cloud-config.target
-Wants=network-online.target cloud-config.target
-ConditionPathExists=!/etc/cloud/cloud-init.disabled
-ConditionKernelCommandLine=!cloud-init=disabled
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/cloud-init modules --mode=config
-RemainAfterExit=yes
-TimeoutSec=0
-
-# Output needs to appear in instance console output
-StandardOutput=journal+console
-
-[Install]
-WantedBy=cloud-init.target
-diff --git a/rhel/systemd/cloud-config.target b/rhel/systemd/cloud-config.target
-deleted file mode 100644
-index ae9b7d02..00000000
--- a/rhel/systemd/cloud-config.target
-+++ /dev/null
-@@ -1,11 +0,0 @@
-# cloud-init normally emits a "cloud-config" upstart event to inform third
-# parties that cloud-config is available, which does us no good when we're
-# using systemd.  cloud-config.target serves as this synchronization point
-# instead.  Services that would "start on cloud-config" with upstart can
-# instead use "After=cloud-config.target" and "Wants=cloud-config.target"
-# as appropriate.
-
-[Unit]
-Description=Cloud-config availability
-Wants=cloud-init-local.service cloud-init.service
-After=cloud-init-local.service cloud-init.service
-diff --git a/rhel/systemd/cloud-final.service b/rhel/systemd/cloud-final.service
-deleted file mode 100644
-index e281c0cf..00000000
--- a/rhel/systemd/cloud-final.service
-+++ /dev/null
-@@ -1,24 +0,0 @@
-[Unit]
-Description=Execute cloud user/final scripts
-After=network-online.target cloud-config.service rc-local.service
-Wants=network-online.target cloud-config.service
-ConditionPathExists=!/etc/cloud/cloud-init.disabled
-ConditionKernelCommandLine=!cloud-init=disabled
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/cloud-init modules --mode=final
-RemainAfterExit=yes
-TimeoutSec=0
-KillMode=process
-# Restart NetworkManager if it is present and running.
-ExecStartPost=/bin/sh -c 'u=NetworkManager.service; \
- out=$(systemctl show --property=SubState $u) || exit; \
- [ "$out" = "SubState=running" ] || exit 0; \
- systemctl reload-or-try-restart $u'
-
-# Output needs to appear in instance console output
-StandardOutput=journal+console
-
-[Install]
-WantedBy=cloud-init.target
-diff --git a/rhel/systemd/cloud-init-local.service b/rhel/systemd/cloud-init-local.service
-deleted file mode 100644
-index 8f9f6c9f..00000000
--- a/rhel/systemd/cloud-init-local.service
-+++ /dev/null
-@@ -1,31 +0,0 @@
-[Unit]
-Description=Initial cloud-init job (pre-networking)
-DefaultDependencies=no
-Wants=network-pre.target
-After=systemd-remount-fs.service
-Requires=dbus.socket
-After=dbus.socket
-Before=NetworkManager.service network.service
-Before=network-pre.target
-Before=shutdown.target
-Before=firewalld.target
-Conflicts=shutdown.target
-RequiresMountsFor=/var/lib/cloud
-ConditionPathExists=!/etc/cloud/cloud-init.disabled
-ConditionKernelCommandLine=!cloud-init=disabled
-
-[Service]
-Type=oneshot
-ExecStartPre=/bin/mkdir -p /run/cloud-init
-ExecStartPre=/sbin/restorecon /run/cloud-init
-ExecStartPre=/usr/bin/touch /run/cloud-init/enabled
-ExecStart=/usr/bin/cloud-init init --local
-ExecStart=/bin/touch /run/cloud-init/network-config-ready
-RemainAfterExit=yes
-TimeoutSec=0
-
-# Output needs to appear in instance console output
-StandardOutput=journal+console
-
-[Install]
-WantedBy=cloud-init.target
-diff --git a/rhel/systemd/cloud-init.service b/rhel/systemd/cloud-init.service
-deleted file mode 100644
-index 0b3d796d..00000000
--- a/rhel/systemd/cloud-init.service
-+++ /dev/null
-@@ -1,26 +0,0 @@
-[Unit]
-Description=Initial cloud-init job (metadata service crawler)
-Wants=cloud-init-local.service
-Wants=sshd-keygen.service
-Wants=sshd.service
-After=cloud-init-local.service
-After=NetworkManager.service network.service
-After=NetworkManager-wait-online.service
-Before=network-online.target
-Before=sshd-keygen.service
-Before=sshd.service
-Before=systemd-user-sessions.service
-ConditionPathExists=!/etc/cloud/cloud-init.disabled
-ConditionKernelCommandLine=!cloud-init=disabled
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/cloud-init init
-RemainAfterExit=yes
-TimeoutSec=0
-
-# Output needs to appear in instance console output
-StandardOutput=journal+console
-
-[Install]
-WantedBy=cloud-init.target
-diff --git a/rhel/systemd/cloud-init.target b/rhel/systemd/cloud-init.target
-deleted file mode 100644
-index 083c3b6f..00000000
--- a/rhel/systemd/cloud-init.target
-+++ /dev/null
-@@ -1,7 +0,0 @@
-# cloud-init target is enabled by cloud-init-generator
-# To disable it you can either:
-#  a.) boot with kernel cmdline of 'cloud-init=disabled'
-#  b.) touch a file /etc/cloud/cloud-init.disabled
-[Unit]
-Description=Cloud-init target
-After=multi-user.target
-diff --git a/setup.py b/setup.py
-index 3c377eaa..a9132d2c 100755
--- a/setup.py
-+++ b/setup.py
-@@ -139,6 +139,21 @@ INITSYS_FILES = {
-     "sysvinit_deb": [f for f in glob("sysvinit/debian/*") if is_f(f)],
-     "sysvinit_openrc": [f for f in glob("sysvinit/gentoo/*") if is_f(f)],
-     "sysvinit_suse": [f for f in glob("sysvinit/suse/*") if is_f(f)],
-+    "systemd": [
-+        render_tmpl(f)
-+        for f in (
-+            glob("systemd/*.tmpl")
-+            + glob("systemd/*.service")
-+            + glob("systemd/*.socket")
-+            + glob("systemd/*.target")
-+        )
-+        if (is_f(f) and not is_generator(f))
-+    ],
-+    "systemd.generators": [
-+        render_tmpl(f, mode=0o755)
-+        for f in glob("systemd/*")
-+        if is_f(f) and is_generator(f)
-+    ],
-     "upstart": [f for f in glob("upstart/*") if is_f(f)],
- }
- INITSYS_ROOTS = {
-@@ -148,6 +163,10 @@ INITSYS_ROOTS = {
-     "sysvinit_deb": "etc/init.d",
-     "sysvinit_openrc": "etc/init.d",
-     "sysvinit_suse": "etc/init.d",
-+    "systemd": pkg_config_read("systemd", "systemdsystemunitdir"),
-+    "systemd.generators": pkg_config_read(
-+        "systemd", "systemdsystemgeneratordir"
-+    ),
-     "upstart": "etc/init/",
- }
- INITSYS_TYPES = sorted([f.partition(".")[0] for f in INITSYS_ROOTS.keys()])
-@@ -262,13 +281,15 @@ data_files = [
-     (
-         USR_LIB_EXEC + "/cloud-init",
-         [
-+            "tools/ds-identify",
-             "tools/hook-hotplug",
-             "tools/uncloud-init",
-             "tools/write-ssh-key-fingerprints",
-         ],
-     ),
-     (
-        ETC + "/bash_completion.d", ["bash_completion/cloud-init"],
-+        USR + "/share/bash-completion/completions",
-+        ["bash_completion/cloud-init"],
-     ),
-     (USR + "/share/doc/cloud-init", [f for f in glob("doc/*") if is_f(f)]),
-     (
-@@ -287,7 +308,8 @@ if not platform.system().endswith("BSD"):
-                 ETC + "/NetworkManager/dispatcher.d/",
-                 ["tools/hook-network-manager"],
-             ),
-            ("/usr/lib/udev/rules.d", [f for f in glob("udev/*.rules")]),
-+            (ETC + "/dhcp/dhclient-exit-hooks.d/", ["tools/hook-dhclient"]),
-+            (LIB + "/udev/rules.d", [f for f in glob("udev/*.rules")]),
-             (
-                 ETC + "/systemd/system/sshd-keygen@.service.d/",
-                 ["systemd/disable-sshd-keygen-if-cloud-init-active.conf"],
-@@ -317,6 +339,8 @@ setuptools.setup(
-     scripts=["tools/cloud-init-per"],
-     license="Dual-licensed under GPLv3 or Apache 2.0",
-     data_files=data_files,
-+    install_requires=requirements,
-+    cmdclass=cmdclass,
-     entry_points={
-         "console_scripts": [
-             "cloud-init = cloudinit.cmd.main:main",
-- 
-2.31.1
-
--- 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
@ -0,0 +1,65 @@
+From 9da40a7e46e40eb090538f9d8a5aa6049fbbc5b8 Mon Sep 17 00:00:00 2001
+From: Ani Sinha <anisinha@redhat.com>
+Date: Tue, 12 Mar 2024 12:52:10 +0530
+Subject: [PATCH] Retain exit code in cloud-init status for recoverable errors
+
+RH-Author: Ani Sinha <None>
+RH-MergeRequest: 126: Retain exit code in cloud-init status for recoverable errors
+RH-Jira: RHEL-28817
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Acked-by: Cathy Avery <cavery@redhat.com>
+RH-Commit: [1/1] 8c45ffe77ed8e964c35af4705d65daaf8282038f
+
+Version 23.4 of cloud-init changed the status code reported by cloud-init for
+recoverable errors from 0 to 2. Please see the commit
+70acb7f2a30d58 ("Add support for cloud-init "degraded" state (#4500)")
+
+This change has the potential to break customers who are expecting a 0 status
+and where warnings can be expected. Hence, revert the status code from 2 to 0
+even in case of recoverable errors. This retains the old behavior and hence
+avoids breaking scripts and software stack that expects 0 on the end user side.
+
+Cannonical has made a similar change downstream for similar reasons. Please see
+https://bugs.launchpad.net/ubuntu/+source/cloud-init/+bug/2048522
+and the corresponding downstream patch:
+https://github.com/canonical/cloud-init/pull/4747/commits/adce34bfd214e4eecdf87329486f30f0898dd303
+
+This patch has limited risk as it narrowly only restores the old status
+code for recoverable errors and does not modify anything else.
+
+X-downstream-only: true
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+---
+ cloudinit/cmd/status.py            | 2 +-
+ tests/unittests/cmd/test_status.py | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cloudinit/cmd/status.py b/cloudinit/cmd/status.py
+index f5ee9c11..849c80bc 100644
+--- a/cloudinit/cmd/status.py
+++ b/cloudinit/cmd/status.py
+@@ -225,7 +225,7 @@ def handle_status_args(name, args) -> int:
+         return 1
+     # Recoverable error
+     elif details.status in UXAppStatusDegradedMap.values():
+-        return 2
+        return 0
+     return 0
+ 
+ 
+diff --git a/tests/unittests/cmd/test_status.py b/tests/unittests/cmd/test_status.py
+index 6c85a59a..567b517a 100644
+--- a/tests/unittests/cmd/test_status.py
+++ b/tests/unittests/cmd/test_status.py
+@@ -636,7 +636,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin
+                 },
+                 None,
+                 MyArgs(long=False, wait=False, format="json"),
+-                2,
+                0,
+                 {
+                     "boot_status_code": "enabled-by-kernel-cmdline",
+                     "datasource": "nocloud",
+-- 
+2.39.3
+
--- a/SOURCES/ci-Revert-Add-native-NetworkManager-support-1224.patch
+++ b/SOURCES/ci-Revert-Add-native-NetworkManager-support-1224.patch
--- a/SOURCES/ci-Revert-Revert-Setting-highest-autoconnect-priority-f.patch
+++ b/SOURCES/ci-Revert-Revert-Setting-highest-autoconnect-priority-f.patch
@ -1,37 +0,0 @@
-From c843f5cf7152846da3422185a6ad344dd47604e6 Mon Sep 17 00:00:00 2001
-From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-Date: Mon, 8 Aug 2022 10:02:48 +0200
-Subject: [PATCH 3/3] Revert "Revert "Setting highest autoconnect priority for
- network-scripts""
-
-RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-RH-MergeRequest: 31: Revert "Revert "Setting highest autoconnect priority for network-scripts""
-RH-Commit: [3/3] 09b83fb559675a2fcd4fc5394b251f034b92c1bc (eesposit/cloud-init-centos-)
-RH-Bugzilla: 2107463 2104389 2117532 2098501
-RH-Acked-by: Eduardo Otubo <otubo@redhat.com>
-RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
-RH-Acked-by: Mohamed Gamal Morsy <mmorsy@redhat.com>
-
-Reverting NM means we also need to restore this patch
-This reverts commit 0eba5c6194017ef493a735cb24757c57d8af7b59.
-
-Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
---
- cloudinit/net/sysconfig.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
-index d8c53312..b50035b5 100644
--- a/cloudinit/net/sysconfig.py
-+++ b/cloudinit/net/sysconfig.py
-@@ -337,6 +337,7 @@ class Renderer(renderer.Renderer):
-             "ONBOOT": True,
-             "USERCTL": False,
-             "BOOTPROTO": "none",
-+            "AUTOCONNECT_PRIORITY": 999
-         },
-         "suse": {"BOOTPROTO": "static", "STARTMODE": "auto"},
-     }
-- 
-2.31.1
-
--- a/SOURCES/ci-Revert-Setting-highest-autoconnect-priority-for-netw.patch
+++ b/SOURCES/ci-Revert-Setting-highest-autoconnect-priority-for-netw.patch
@ -1,37 +0,0 @@
-From e5e2ba9e21ac40ec7b8fe1c1dcf501eaeb9f66bf Mon Sep 17 00:00:00 2001
-From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-Date: Mon, 2 May 2022 14:43:17 +0200
-Subject: [PATCH 3/5] Revert "Setting highest autoconnect priority for
- network-scripts"
-
-RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-RH-MergeRequest: 24: Add native NetworkManager support (#1224)
-RH-Commit: [3/3] 06c87581fc42b6827ad9df600f3dd76d51ced0d0 (eesposit/cloud-init-centos-)
-RH-Bugzilla: 2056964
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
-
-This reverts commit 0ef0c86350aa5f800f8393a432f431e2818c8938,
-since it was a temporary downstream-only patch while we waited for
-"Add native NetworkManager support (#1224)".
-
-Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
---
- cloudinit/net/sysconfig.py | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
-index 2a45a4fa..dc401d78 100644
--- a/cloudinit/net/sysconfig.py
-+++ b/cloudinit/net/sysconfig.py
-@@ -317,7 +317,6 @@ class Renderer(renderer.Renderer):
-             "ONBOOT": True,
-             "USERCTL": False,
-             "BOOTPROTO": "none",
-            "AUTOCONNECT_PRIORITY": 999
-         },
-         "suse": {"BOOTPROTO": "static", "STARTMODE": "auto"},
-     }
-- 
-2.31.1
-
--- a/SOURCES/ci-Revert-Use-Network-Manager-and-Netplan-as-default-re.patch
+++ b/SOURCES/ci-Revert-Use-Network-Manager-and-Netplan-as-default-re.patch
@ -1,75 +0,0 @@
-From c063021168dee7937281decd8f9b601f49a7d0f3 Mon Sep 17 00:00:00 2001
-From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-Date: Mon, 8 Aug 2022 10:02:17 +0200
-Subject: [PATCH 2/3] Revert "Use Network-Manager and Netplan as default
- renderers for RHEL and Fedora (#1465)"
-
-RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-RH-MergeRequest: 31: Revert "Revert "Setting highest autoconnect priority for network-scripts""
-RH-Commit: [2/3] bd662b768dc694c748cab9e36bc5ff0eb009e128 (eesposit/cloud-init-centos-)
-RH-Bugzilla: 2107463 2104389 2117532 2098501
-RH-Acked-by: Eduardo Otubo <otubo@redhat.com>
-RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
-RH-Acked-by: Mohamed Gamal Morsy <mmorsy@redhat.com>
-
-As NM is reverted, remove also documentation and any trace of it.
-This reverts commit bbd9f47a7988e15a2823b065cd539d7c9562d77e.
-
-Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
---
- config/cloud.cfg.tmpl             |  3 ---
- doc/rtd/topics/network-config.rst | 12 +-----------
- 2 files changed, 1 insertion(+), 14 deletions(-)
-
-diff --git a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl
-index f4d2fd14..80ab4f96 100644
--- a/config/cloud.cfg.tmpl
-+++ b/config/cloud.cfg.tmpl
-@@ -353,7 +353,4 @@ system_info:
- {% elif variant in ["dragonfly"] %}
-    network:
-       renderers: ['freebsd']
-{% elif variant in ["rhel", "fedora"] %}
-   network:
-      renderers: ['netplan', 'network-manager', 'networkd', 'sysconfig', 'eni']
- {% endif %}
-diff --git a/doc/rtd/topics/network-config.rst b/doc/rtd/topics/network-config.rst
-index f503caab..c461a3fe 100644
--- a/doc/rtd/topics/network-config.rst
-+++ b/doc/rtd/topics/network-config.rst
-@@ -188,15 +188,6 @@ generated configuration into an internal network configuration state. From
- this state `Cloud-init`_ delegates rendering of the configuration to Distro
- supported formats.  The following ``renderers`` are supported in cloud-init:
- 
-- **NetworkManager**
-
-`NetworkManager <https://networkmanager.dev>`_ is the standard Linux network
-configuration tool suite. It supports a wide range of networking setups.
-Configuration is typically stored in ``/etc/NetworkManager``.
-
-It is the default for a number of Linux distributions, notably Fedora;
-CentOS/RHEL; and derivatives.
-
- - **ENI**
- 
- /etc/network/interfaces or ``ENI`` is supported by the ``ifupdown`` package
-@@ -224,7 +215,6 @@ is as follows:
- - ENI
- - Sysconfig
- - Netplan
-- NetworkManager
- 
- When applying the policy, `Cloud-init`_ checks if the current instance has the
- correct binaries and paths to support the renderer.  The first renderer that
-@@ -233,7 +223,7 @@ supplying an updated configuration in cloud-config. ::
- 
-   system_info:
-     network:
-      renderers: ['netplan', 'network-manager', 'eni', 'sysconfig', 'freebsd', 'netbsd', 'openbsd']
-+      renderers: ['netplan', 'eni', 'sysconfig', 'freebsd', 'netbsd', 'openbsd']
- 
- 
- Network Configuration Tools
-- 
-2.31.1
-
--- 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
@ -0,0 +1,242 @@
+From ce17b057e4bd5dfaa2cc72991736a1b82704488c Mon Sep 17 00:00:00 2001
+From: Brett Holman <brett.holman@canonical.com>
+Date: Tue, 23 Jan 2024 11:47:35 -0700
+Subject: [PATCH] Revert "Use grep for faster parsing of cloud config in
+ ds-identify (#4327)"
+
+RH-Author: Ani Sinha <None>
+RH-MergeRequest: 122: Revert "Use grep for faster parsing of cloud config in ds-identify (#4327)"
+RH-Jira: RHEL-22248
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Acked-by: Jon Maloy <jmaloy@redhat.com>
+RH-Commit: [1/1] f14ebd0055aad9340249e83381cf976debdbe38d
+
+This reverts commit 816e05d4830f5e789f1f85ef926e2849156bff3a.
+
+Reopens LP: 2030729
+Fixes GH-4794
+
+(cherry picked from commit 8ff94fe9493ad88344eb8bbf2f023c6ba2db5206)
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+---
+ tests/unittests/test_ds_identify.py | 146 +---------------------------
+ tools/ds-identify                   |  31 +++---
+ 2 files changed, 15 insertions(+), 162 deletions(-)
+
+diff --git a/tests/unittests/test_ds_identify.py b/tests/unittests/test_ds_identify.py
+index ca206fb5..ba0bf779 100644
+--- a/tests/unittests/test_ds_identify.py
+++ b/tests/unittests/test_ds_identify.py
+@@ -57,146 +57,6 @@ BLKID_UEFI_UBUNTU = [
+ ]
+ 
+ 
+-DEFAULT_CLOUD_CONFIG = """\
+-# The top level settings are used as module
+-# and base configuration.
+-# A set of users which may be applied and/or used by various modules
+-# when a 'default' entry is found it will reference the 'default_user'
+-# from the distro configuration specified below
+-users:
+-   - default
+-
+-# If this is set, 'root' will not be able to ssh in and they
+-# will get a message to login instead as the default $user
+-disable_root: true
+-
+-# This will cause the set+update hostname module to not operate (if true)
+-preserve_hostname: false
+-
+-# If you use datasource_list array, keep array items in a single line.
+-# If you use multi line array, ds-identify script won't read array items.
+-# Example datasource config
+-# datasource:
+-#    Ec2:
+-#      metadata_urls: [ 'blah.com' ]
+-#      timeout: 5 # (defaults to 50 seconds)
+-#      max_wait: 10 # (defaults to 120 seconds)
+-
+-# The modules that run in the 'init' stage
+-cloud_init_modules:
+- - migrator
+- - seed_random
+- - bootcmd
+- - write-files
+- - growpart
+- - resizefs
+- - disk_setup
+- - mounts
+- - set_hostname
+- - update_hostname
+- - update_etc_hosts
+- - ca-certs
+- - rsyslog
+- - users-groups
+- - ssh
+-
+-# The modules that run in the 'config' stage
+-cloud_config_modules:
+- - wireguard
+- - snap
+- - ubuntu_autoinstall
+- - ssh-import-id
+- - keyboard
+- - locale
+- - set-passwords
+- - grub-dpkg
+- - apt-pipelining
+- - apt-configure
+- - ubuntu-advantage
+- - ntp
+- - timezone
+- - disable-ec2-metadata
+- - runcmd
+- - byobu
+-
+-# The modules that run in the 'final' stage
+-cloud_final_modules:
+- - package-update-upgrade-install
+- - fan
+- - landscape
+- - lxd
+- - ubuntu-drivers
+- - write-files-deferred
+- - puppet
+- - chef
+- - ansible
+- - mcollective
+- - salt-minion
+- - reset_rmc
+- - refresh_rmc_and_interface
+- - rightscale_userdata
+- - scripts-vendor
+- - scripts-per-once
+- - scripts-per-boot
+- - scripts-per-instance
+- - scripts-user
+- - ssh-authkey-fingerprints
+- - keys-to-console
+- - install-hotplug
+- - phone-home
+- - final-message
+- - power-state-change
+-
+-# System and/or distro specific settings
+-# (not accessible to handlers/transforms)
+-system_info:
+-   # This will affect which distro class gets used
+-   distro: ubuntu
+-   # Default user name + that default users groups (if added/used)
+-   default_user:
+-     name: ubuntu
+-     lock_passwd: True
+-     gecos: Ubuntu
+-     groups: [adm, audio, cdrom, floppy, lxd, netdev, plugdev, sudo, video]
+-     sudo: ["ALL=(ALL) NOPASSWD:ALL"]
+-     shell: /bin/bash
+-   network:
+-     renderers: ['netplan', 'eni', 'sysconfig']
+-     activators: ['netplan', 'eni', 'network-manager', 'networkd']
+-   # Automatically discover the best ntp_client
+-   ntp_client: auto
+-   # Other config here will be given to the distro class and/or path classes
+-   paths:
+-      cloud_dir: /var/lib/cloud/
+-      templates_dir: /etc/cloud/templates/
+-   package_mirrors:
+-     - arches: [i386, amd64]
+-       failsafe:
+-         primary: http://archive.ubuntu.com/ubuntu
+-         security: http://security.ubuntu.com/ubuntu
+-       search:
+-         primary:
+-           - http://%(ec2_region)s.ec2.archive.ubuntu.com/ubuntu/
+-           - http://%(availability_zone)s.clouds.archive.ubuntu.com/ubuntu/
+-           - http://%(region)s.clouds.archive.ubuntu.com/ubuntu/
+-         security: []
+-     - arches: [arm64, armel, armhf]
+-       failsafe:
+-         primary: http://ports.ubuntu.com/ubuntu-ports
+-         security: http://ports.ubuntu.com/ubuntu-ports
+-       search:
+-         primary:
+-           - http://%(ec2_region)s.ec2.ports.ubuntu.com/ubuntu-ports/
+-           - http://%(availability_zone)s.clouds.ports.ubuntu.com/ubuntu-ports/
+-           - http://%(region)s.clouds.ports.ubuntu.com/ubuntu-ports/
+-         security: []
+-     - arches: [default]
+-       failsafe:
+-         primary: http://ports.ubuntu.com/ubuntu-ports
+-         security: http://ports.ubuntu.com/ubuntu-ports
+-   ssh_svcname: ssh
+-"""
+-
+ POLICY_FOUND_ONLY = "search,found=all,maybe=none,notfound=disabled"
+ POLICY_FOUND_OR_MAYBE = "search,found=all,maybe=all,notfound=disabled"
+ DI_DEFAULT_POLICY = "search,found=all,maybe=all,notfound=disabled"
+@@ -279,10 +139,6 @@ class DsIdentifyBase(CiTestCase):
+         if files is None:
+             files = {}
+ 
+-        cloudcfg = "etc/cloud/cloud.cfg"
+-        if cloudcfg not in files:
+-            files[cloudcfg] = DEFAULT_CLOUD_CONFIG
+-
+         if rootd is None:
+             rootd = self.tmp_dir()
+ 
+@@ -1305,7 +1161,7 @@ VALID_CFG = {
+             # Also include a datasource list of more than just
+             # [NoCloud, None], because that would automatically select
+             # NoCloud without checking
+-            "etc/cloud/cloud.cfg": dedent(
+            "/etc/cloud/cloud.cfg": dedent(
+                 """\
+                 datasource_list: [ Azure, Openstack, NoCloud, None ]
+                 datasource:
+diff --git a/tools/ds-identify b/tools/ds-identify
+index 7a537278..ec2cc18a 100755
+--- a/tools/ds-identify
+++ b/tools/ds-identify
+@@ -777,24 +777,21 @@ check_config() {
+     if [ "$1" = "$files" -a ! -f "$1" ]; then
+         return 1
+     fi
+-    local line="" ret="" found=0 found_fn="" oifs="$IFS" out=""
+-    out=$(grep "$key\"\?:" "$@" 2>/dev/null)
+-    IFS=${CR}
+-    for line in $out; do
+-        # drop '# comment'
+-        line=${line%%#*}
+-        # if more than one file was 'grep'ed, then grep will output filename:
+-        # but if only one file, line will not be prefixed.
+-        if [ $# -eq 1 ]; then
+-            found_fn="$1"
+-        else
+-            found_fn="${line%%:*}"
+-            line=${line#*:}
+-        fi
+-        ret=${line#*: };
+-        found=$((found+1))
+    local fname="" line="" ret="" found=0 found_fn=""
+    # shellcheck disable=2094
+    for fname in "$@"; do
+        [ -f "$fname" ] || continue
+        while read line; do
+            line=${line%%#*}
+            case "$line" in
+                $key:\ *|"${key}":)
+                    ret=${line#*:};
+                    ret=${ret# };
+                    found=$((found+1))
+                    found_fn="$fname";;
+            esac
+        done <"$fname"
+     done
+-    IFS="$oifs"
+     if [ $found -ne 0 ]; then
+         _RET="$ret"
+         _RET_fname="$found_fn"
+-- 
+2.41.0
+
--- a/SOURCES/ci-Revert-systemd-Standardize-cloud-init-systemd-enable.patch
+++ b/SOURCES/ci-Revert-systemd-Standardize-cloud-init-systemd-enable.patch
@ -0,0 +1,108 @@
+From 42aad98557bb62ae693f38e5f1e137bcc44f6046 Mon Sep 17 00:00:00 2001
+From: Ani Sinha <anisinha@redhat.com>
+Date: Tue, 5 Mar 2024 12:42:26 +0530
+Subject: [PATCH] Revert "systemd: Standardize cloud-init systemd enablement
+ (#4399)"
+
+RH-Author: Ani Sinha <None>
+RH-MergeRequest: 124: Revert "systemd: Standardize cloud-init systemd enablement (#4399)"
+RH-Jira: RHEL-21290
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Acked-by: Cathy Avery <cavery@redhat.com>
+RH-Commit: [1/1] 10da53e761e25ff7d254a4cfb8fb1fd18de8b4ed
+
+This reverts commit ec7dde8041d4023b09324e84abe37dc766ebbaf6.
+
+'ConditionEnvironment' clause is not available in RHEL 8.10 systemd and adding
+the feature would be complicated. Hence reverting the patch seems to be the
+right thing to do as it was a simple enhancement to make sure all distros use
+systemd's kernel commandline and file conditionals. We only care about RHEL so
+the change should not affect us.
+
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+---
+ systemd/cloud-config.service.tmpl     | 3 ++-
+ systemd/cloud-final.service.tmpl      | 3 ++-
+ systemd/cloud-init-local.service.tmpl | 3 ++-
+ systemd/cloud-init.service.tmpl       | 3 ++-
+ systemd/cloud-init.target             | 3 ---
+ 5 files changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/systemd/cloud-config.service.tmpl b/systemd/cloud-config.service.tmpl
+index 31d9d983..76e50ae1 100644
+--- a/systemd/cloud-config.service.tmpl
+++ b/systemd/cloud-config.service.tmpl
+@@ -5,9 +5,10 @@ After=network-online.target cloud-config.target
+ After=snapd.seeded.service
+ Before=systemd-user-sessions.service
+ Wants=network-online.target cloud-config.target
+{% if variant == "rhel" %}
+ ConditionPathExists=!/etc/cloud/cloud-init.disabled
+ ConditionKernelCommandLine=!cloud-init=disabled
+-ConditionEnvironment=!KERNEL_CMDLINE=cloud-init=disabled
+{% endif %}
+ 
+ [Service]
+ Type=oneshot
+diff --git a/systemd/cloud-final.service.tmpl b/systemd/cloud-final.service.tmpl
+index bcf8b009..85f423ac 100644
+--- a/systemd/cloud-final.service.tmpl
+++ b/systemd/cloud-final.service.tmpl
+@@ -7,9 +7,10 @@ After=multi-user.target
+ Before=apt-daily.service
+ {% endif %}
+ Wants=network-online.target cloud-config.service
+{% if variant == "rhel" %}
+ ConditionPathExists=!/etc/cloud/cloud-init.disabled
+ ConditionKernelCommandLine=!cloud-init=disabled
+-ConditionEnvironment=!KERNEL_CMDLINE=cloud-init=disabled
+{% endif %}
+ 
+ 
+ [Service]
+diff --git a/systemd/cloud-init-local.service.tmpl b/systemd/cloud-init-local.service.tmpl
+index 3a1ca7fa..6f3f9d8d 100644
+--- a/systemd/cloud-init-local.service.tmpl
+++ b/systemd/cloud-init-local.service.tmpl
+@@ -26,9 +26,10 @@ Before=sysinit.target
+ Conflicts=shutdown.target
+ {% endif %}
+ RequiresMountsFor=/var/lib/cloud
+{% if variant == "rhel" %}
+ ConditionPathExists=!/etc/cloud/cloud-init.disabled
+ ConditionKernelCommandLine=!cloud-init=disabled
+-ConditionEnvironment=!KERNEL_CMDLINE=cloud-init=disabled
+{% endif %}
+ 
+ [Service]
+ Type=oneshot
+diff --git a/systemd/cloud-init.service.tmpl b/systemd/cloud-init.service.tmpl
+index bf91164a..26d2e39c 100644
+--- a/systemd/cloud-init.service.tmpl
+++ b/systemd/cloud-init.service.tmpl
+@@ -38,9 +38,10 @@ Conflicts=shutdown.target
+ Before=shutdown.target
+ Conflicts=shutdown.target
+ {% endif %}
+{% if variant == "rhel" %}
+ ConditionPathExists=!/etc/cloud/cloud-init.disabled
+ ConditionKernelCommandLine=!cloud-init=disabled
+-ConditionEnvironment=!KERNEL_CMDLINE=cloud-init=disabled
+{% endif %}
+ 
+ [Service]
+ Type=oneshot
+diff --git a/systemd/cloud-init.target b/systemd/cloud-init.target
+index 30450f7f..760dfee5 100644
+--- a/systemd/cloud-init.target
+++ b/systemd/cloud-init.target
+@@ -10,6 +10,3 @@
+ [Unit]
+ Description=Cloud-init target
+ After=multi-user.target
+-ConditionPathExists=!/etc/cloud/cloud-init.disabled
+-ConditionKernelCommandLine=!cloud-init=disabled
+-ConditionEnvironment=!KERNEL_CMDLINE=cloud-init=disabled
+-- 
+2.39.3
+
--- a/SOURCES/ci-Support-EC2-tags-in-instance-metadata-1309.patch
+++ b/SOURCES/ci-Support-EC2-tags-in-instance-metadata-1309.patch
@ -1,165 +0,0 @@
-From f5e9ed6c698eddd30e8e97d6f71070e7b75b1381 Mon Sep 17 00:00:00 2001
-From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-Date: Mon, 30 May 2022 16:45:08 +0200
-Subject: [PATCH 1/2] Support EC2 tags in instance metadata (#1309)
-
-RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-RH-MergeRequest: 27: Support EC2 tags in instance metadata (#1309)
-RH-Commit: [1/1] f6a03e1619316959d3cd1806981b0bebf12bd3b0 (eesposit/cloud-init-centos-)
-RH-Bugzilla: 2091640
-RH-Acked-by: Eduardo Otubo <otubo@redhat.com>
-RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
-RH-Acked-by: Mohamed Gamal Morsy <mmorsy@redhat.com>
-
-commit 40c52ce1f4049449b04f93226721f63af874c5c7
-Author: Eduardo Dobay <edudobay@users.noreply.github.com>
-Date:   Wed Apr 6 01:28:01 2022 -0300
-
-    Support EC2 tags in instance metadata (#1309)
-
-    Add support for newer EC2 metadata versions (up to 2021-03-23), so that
-    tags can be retrieved from the `ds.meta_data.tags` field, as well as
-    with any new fields that might have been added since the 2018-09-24
-    version.
-
-Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
---
- cloudinit/sources/DataSourceEc2.py  |  5 +++--
- doc/rtd/topics/datasources/ec2.rst  | 28 ++++++++++++++++++++++------
- tests/unittests/sources/test_ec2.py | 26 +++++++++++++++++++++++++-
- tools/.github-cla-signers           |  1 +
- 4 files changed, 51 insertions(+), 9 deletions(-)
-
-diff --git a/cloudinit/sources/DataSourceEc2.py b/cloudinit/sources/DataSourceEc2.py
-index 03b3870c..a030b498 100644
--- a/cloudinit/sources/DataSourceEc2.py
-+++ b/cloudinit/sources/DataSourceEc2.py
-@@ -61,8 +61,9 @@ class DataSourceEc2(sources.DataSource):
-     min_metadata_version = "2009-04-04"
- 
-     # Priority ordered list of additional metadata versions which will be tried
-    # for extended metadata content. IPv6 support comes in 2016-09-02
-    extended_metadata_versions = ["2018-09-24", "2016-09-02"]
-+    # for extended metadata content. IPv6 support comes in 2016-09-02.
-+    # Tags support comes in 2021-03-23.
-+    extended_metadata_versions = ["2021-03-23", "2018-09-24", "2016-09-02"]
- 
-     # Setup read_url parameters per get_url_params.
-     url_max_wait = 120
-diff --git a/doc/rtd/topics/datasources/ec2.rst b/doc/rtd/topics/datasources/ec2.rst
-index 94e4158d..77232269 100644
--- a/doc/rtd/topics/datasources/ec2.rst
-+++ b/doc/rtd/topics/datasources/ec2.rst
-@@ -38,11 +38,26 @@ Userdata is accessible via the following URL:
-     GET http://169.254.169.254/2009-04-04/user-data
-     1234,fred,reboot,true | 4512,jimbo, | 173,,,
- 
-Note that there are multiple versions of this data provided, cloud-init
-by default uses **2009-04-04** but newer versions can be supported with
-relative ease (newer versions have more data exposed, while maintaining
-backward compatibility with the previous versions).
-Version **2016-09-02** is required for secondary IP address support.
-+Note that there are multiple EC2 Metadata versions of this data provided
-+to instances. cloud-init will attempt to use the most recent API version it
-+supports in order to get latest API features and instance-data. If a given
-+API version is not exposed to the instance, those API features will be
-+unavailable to the instance.
-+
-+
-++----------------+----------------------------------------------------------+
-++ EC2 version    | supported instance-data/feature                          |
-++================+==========================================================+
-++ **2021-03-23** | Required for Instance tag support. This feature must be  |
-+|                | enabled individually on each instance.  See the          |
-+|                | `EC2 tags user guide`_.                                  |
-++----------------+----------------------------------------------------------+
-+| **2016-09-02** | Required for secondary IP address support.               |
-++----------------+----------------------------------------------------------+
-+| **2009-04-04** | Minimum supports EC2 API version for meta-data and       |
-+|                | user-data.                                               |
-++----------------+----------------------------------------------------------+
-+
- 
- To see which versions are supported from your cloud provider use the following
- URL:
-@@ -71,7 +86,7 @@ configuration (in `/etc/cloud/cloud.cfg` or `/etc/cloud/cloud.cfg.d/`).
- 
- The settings that may be configured are:
- 
- * **metadata_urls**: This list of urls will be searched for an Ec2
-+ * **metadata_urls**: This list of urls will be searched for an EC2
-    metadata service. The first entry that successfully returns a 200 response
-    for <url>/<version>/meta-data/instance-id will be selected.
-    (default: ['http://169.254.169.254', 'http://instance-data:8773']).
-@@ -121,4 +136,5 @@ Notes
-    For example: the primary NIC will have a DHCP route-metric of 100,
-    the next NIC will be 200.
- 
-+.. _EC2 tags user guide: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_Tags.html#work-with-tags-in-IMDS
- .. vi: textwidth=79
-diff --git a/tests/unittests/sources/test_ec2.py b/tests/unittests/sources/test_ec2.py
-index b376660d..7c8a5ea5 100644
--- a/tests/unittests/sources/test_ec2.py
-+++ b/tests/unittests/sources/test_ec2.py
-@@ -210,6 +210,17 @@ SECONDARY_IP_METADATA_2018_09_24 = {
- 
- M_PATH_NET = "cloudinit.sources.DataSourceEc2.net."
- 
-+TAGS_METADATA_2021_03_23 = {
-+    **DEFAULT_METADATA,
-+    "tags": {
-+        "instance": {
-+            "Environment": "production",
-+            "Application": "test",
-+            "TagWithoutValue": "",
-+        }
-+    },
-+}
-+
- 
- def _register_ssh_keys(rfunc, base_url, keys_data):
-     """handle ssh key inconsistencies.
-@@ -670,7 +681,7 @@ class TestEc2(test_helpers.HttprettyTestCase):
-         logs_with_redacted = [log for log in all_logs if REDACT_TOK in log]
-         logs_with_token = [log for log in all_logs if "API-TOKEN" in log]
-         self.assertEqual(1, len(logs_with_redacted_ttl))
-        self.assertEqual(81, len(logs_with_redacted))
-+        self.assertEqual(83, len(logs_with_redacted))
-         self.assertEqual(0, len(logs_with_token))
- 
-     @mock.patch("cloudinit.net.dhcp.maybe_perform_dhcp_discovery")
-@@ -811,6 +822,19 @@ class TestEc2(test_helpers.HttprettyTestCase):
-         )
-         self.assertIn("Crawl of metadata service took", self.logs.getvalue())
- 
-+    def test_get_instance_tags(self):
-+        ds = self._setup_ds(
-+            platform_data=self.valid_platform_data,
-+            sys_cfg={"datasource": {"Ec2": {"strict_id": False}}},
-+            md={"md": TAGS_METADATA_2021_03_23},
-+        )
-+        self.assertTrue(ds.get_data())
-+        self.assertIn("tags", ds.metadata)
-+        self.assertIn("instance", ds.metadata["tags"])
-+        instance_tags = ds.metadata["tags"]["instance"]
-+        self.assertEqual(instance_tags["Application"], "test")
-+        self.assertEqual(instance_tags["Environment"], "production")
-+
- 
- class TestGetSecondaryAddresses(test_helpers.CiTestCase):
- 
-diff --git a/tools/.github-cla-signers b/tools/.github-cla-signers
-index ac157a2f..9f71ea0c 100644
--- a/tools/.github-cla-signers
-+++ b/tools/.github-cla-signers
-@@ -26,6 +26,7 @@ dermotbradley
- dhensby
- eandersson
- eb3095
-+edudobay
- emmanuelthome
- eslerm
- esposem
-- 
-2.31.1
-
--- a/SOURCES/ci-Use-Network-Manager-and-Netplan-as-default-renderers.patch
+++ b/SOURCES/ci-Use-Network-Manager-and-Netplan-as-default-renderers.patch
@ -1,109 +0,0 @@
-From 840d6f7ca86fe9822c613f0f2c21f136271ce3b6 Mon Sep 17 00:00:00 2001
-From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-Date: Thu, 19 May 2022 15:44:03 +0200
-Subject: [PATCH 2/5] Use Network-Manager and Netplan as default renderers for
- RHEL and Fedora (#1465)
-
-RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-RH-MergeRequest: 24: Add native NetworkManager support (#1224)
-RH-Commit: [2/3] e33081b15a8558967bb480ed659116e7e0872840 (eesposit/cloud-init-centos-)
-RH-Bugzilla: 2056964
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
-
-commit 7703aa98b89c8daba207c28a0422268ead10019a
-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-Date:   Thu May 19 15:05:01 2022 +0200
-
-    Use Network-Manager and Netplan as default renderers for RHEL and Fedora (#1465)
-
-    This is adapted from Neal Gompa's PR:
-    https://github.com/canonical/cloud-init/pull/1435
-
-    The only difference is that we are not modifying renderers.py (thus
-    modifying the priority of all distros), but just tweaking cloud.cfg to
-    apply this change to Fedora and RHEL. Other distros can optionally
-    add themselves afterwards.
-
-            net: Prefer Netplan and NetworkManager renderers by default
-
-            NetworkManager is used by default on a variety of Linux distributions,
-            and exists as a cross-distribution network management service.
-
-            Additionally, add information about the NetworkManager renderer to
-            the cloud-init documentation.
-
-            Because Netplan can be explicitly used to manage NetworkManager,
-            it needs to be preferred before NetworkManager.
-
-            This change is a follow-up to #1224, which added the native
-            NetworkManager renderer.
-            This patch has been deployed on Fedora's cloud-init package throughout
-            the development of Fedora Linux 36 to verify that it works.
-
-            This should also make it tremendously easier for Linux distributions
-            to use cloud-init because now a standard configuration is supported
-            by default.
-
-            Signed-off-by: Neal Gompa <ngompa13@gmail.com>
-
-    Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-
-Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
---
- config/cloud.cfg.tmpl             |  3 +++
- doc/rtd/topics/network-config.rst | 12 +++++++++++-
- 2 files changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl
-index fb4b456c..86beee3c 100644
--- a/config/cloud.cfg.tmpl
-+++ b/config/cloud.cfg.tmpl
-@@ -330,4 +330,7 @@ system_info:
- {% elif variant in ["dragonfly"] %}
-    network:
-       renderers: ['freebsd']
-+{% elif variant in ["rhel", "fedora"] %}
-+   network:
-+      renderers: ['netplan', 'network-manager', 'networkd', 'sysconfig', 'eni']
- {% endif %}
-diff --git a/doc/rtd/topics/network-config.rst b/doc/rtd/topics/network-config.rst
-index c461a3fe..f503caab 100644
--- a/doc/rtd/topics/network-config.rst
-+++ b/doc/rtd/topics/network-config.rst
-@@ -188,6 +188,15 @@ generated configuration into an internal network configuration state. From
- this state `Cloud-init`_ delegates rendering of the configuration to Distro
- supported formats.  The following ``renderers`` are supported in cloud-init:
- 
-+- **NetworkManager**
-+
-+`NetworkManager <https://networkmanager.dev>`_ is the standard Linux network
-+configuration tool suite. It supports a wide range of networking setups.
-+Configuration is typically stored in ``/etc/NetworkManager``.
-+
-+It is the default for a number of Linux distributions, notably Fedora;
-+CentOS/RHEL; and derivatives.
-+
- - **ENI**
- 
- /etc/network/interfaces or ``ENI`` is supported by the ``ifupdown`` package
-@@ -215,6 +224,7 @@ is as follows:
- - ENI
- - Sysconfig
- - Netplan
-+- NetworkManager
- 
- When applying the policy, `Cloud-init`_ checks if the current instance has the
- correct binaries and paths to support the renderer.  The first renderer that
-@@ -223,7 +233,7 @@ supplying an updated configuration in cloud-config. ::
- 
-   system_info:
-     network:
-      renderers: ['netplan', 'eni', 'sysconfig', 'freebsd', 'netbsd', 'openbsd']
-+      renderers: ['netplan', 'network-manager', 'eni', 'sysconfig', 'freebsd', 'netbsd', 'openbsd']
- 
- 
- Network Configuration Tools
-- 
-2.31.1
-
--- a/SOURCES/ci-cc_set_hostname-do-not-write-localhost-when-no-hostn.patch
+++ b/SOURCES/ci-cc_set_hostname-do-not-write-localhost-when-no-hostn.patch
@ -1,801 +0,0 @@
-From d1790e6462e509e3cd87fc449df84fbd02ca1d89 Mon Sep 17 00:00:00 2001
-From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-Date: Thu, 2 Jun 2022 16:03:43 +0200
-Subject: [PATCH 2/2] cc_set_hostname: do not write "localhost" when no
- hostname is given (#1453)
-
-RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-RH-MergeRequest: 28: cc_set_hostname: do not write "localhost" when no hostname is given (#1453)
-RH-Commit: [1/1] 4370e9149371dc89be82cb05d30d33e4d2638cec (eesposit/cloud-init-centos-)
-RH-Bugzilla: 1980403
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: Mohamed Gamal Morsy <mmorsy@redhat.com>
-
-commit 74e43496f353db52e15d96abeb54ad63baac5be9
-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-Date:   Tue May 31 16:03:44 2022 +0200
-
-    cc_set_hostname: do not write "localhost" when no hostname is given (#1453)
-
-    Systemd used to sometimes ignore localhost in /etc/hostnames, and many programs
-    like cloud-init used this as a workaround to set a default hostname.
-
-    From https://github.com/systemd/systemd/commit/d39079fcaa05e23540d2b1f0270fa31c22a7e9f1:
-
-            We would sometimes ignore localhost-style names in /etc/hostname. That is
-            brittle. If the user configured some hostname, it's most likely because they
-            want to use that as the hostname. If they don't want to use such a hostname,
-            they should just not create the config. Everything becomes simples if we just
-            use the configured hostname as-is.
-
-            This behaviour seems to have been a workaround for Anaconda installer and other
-            tools writing out /etc/hostname with the default of "localhost.localdomain".
-            Anaconda PR to stop doing that: rhinstaller/anaconda#3040.
-            That might have been useful as a work-around for other programs misbehaving if
-            /etc/hostname was not present, but nowadays it's not useful because systemd
-            mostly controls the hostname and it is perfectly happy without that file.
-
-            Apart from making things simpler, this allows users to set a hostname like
-            "localhost" and have it honoured, if such a whim strikes them.
-
-    As also suggested by the Anaconda PR, we need to stop writing default "localhost"
-    in /etc/hostnames, and let the right service (networking, user) do that if they
-    need to. Otherwise, "localhost" will permanently stay as hostname and will
-    prevent other tools like NetworkManager from setting the right one.
-
-    Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-
-    RHBZ: 1980403
-
-Conflicts:
-	cloudinit/config/cc_update_etc_hosts.py
-	cloudinit/sources/DataSourceCloudSigma.py
-	cloudinit/util.py
-	tests/unittests/test_util.py
-	    Additional imports and/or conditionals that are not present in this version
-
-Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
---
- cloudinit/cmd/main.py                         |  2 +-
- cloudinit/config/cc_apt_configure.py          |  2 +-
- cloudinit/config/cc_debug.py                  |  2 +-
- cloudinit/config/cc_phone_home.py             |  4 +-
- cloudinit/config/cc_set_hostname.py           |  6 ++-
- cloudinit/config/cc_spacewalk.py              |  2 +-
- cloudinit/config/cc_update_etc_hosts.py       |  4 +-
- cloudinit/config/cc_update_hostname.py        |  7 +++-
- cloudinit/sources/DataSourceAliYun.py         |  8 +++-
- cloudinit/sources/DataSourceCloudSigma.py     |  6 ++-
- cloudinit/sources/DataSourceGCE.py            |  5 ++-
- cloudinit/sources/DataSourceScaleway.py       |  3 +-
- cloudinit/sources/__init__.py                 | 28 ++++++++++---
- cloudinit/util.py                             | 29 +++++++++++---
- .../unittests/config/test_cc_set_hostname.py  | 40 ++++++++++++++++++-
- tests/unittests/sources/test_aliyun.py        |  2 +-
- tests/unittests/sources/test_cloudsigma.py    |  8 ++--
- tests/unittests/sources/test_digitalocean.py  |  2 +-
- tests/unittests/sources/test_gce.py           |  4 +-
- tests/unittests/sources/test_hetzner.py       |  2 +-
- tests/unittests/sources/test_init.py          | 29 +++++++++-----
- tests/unittests/sources/test_scaleway.py      |  2 +-
- tests/unittests/sources/test_vmware.py        |  4 +-
- tests/unittests/test_util.py                  | 17 ++++----
- tests/unittests/util.py                       |  3 +-
- 25 files changed, 166 insertions(+), 55 deletions(-)
-
-diff --git a/cloudinit/cmd/main.py b/cloudinit/cmd/main.py
-index c9be41b3..816d31aa 100644
--- a/cloudinit/cmd/main.py
-+++ b/cloudinit/cmd/main.py
-@@ -813,7 +813,7 @@ def _maybe_set_hostname(init, stage, retry_stage):
-     @param retry_stage: String represented logs upon error setting hostname.
-     """
-     cloud = init.cloudify()
-    (hostname, _fqdn) = util.get_hostname_fqdn(
-+    (hostname, _fqdn, _) = util.get_hostname_fqdn(
-         init.cfg, cloud, metadata_only=True
-     )
-     if hostname:  # meta-data or user-data hostname content
-diff --git a/cloudinit/config/cc_apt_configure.py b/cloudinit/config/cc_apt_configure.py
-index c558311a..0e6466ec 100644
--- a/cloudinit/config/cc_apt_configure.py
-+++ b/cloudinit/config/cc_apt_configure.py
-@@ -753,7 +753,7 @@ def search_for_mirror_dns(configured, mirrortype, cfg, cloud):
-             raise ValueError("unknown mirror type")
- 
-         # if we have a fqdn, then search its domain portion first
-        (_, fqdn) = util.get_hostname_fqdn(cfg, cloud)
-+        fqdn = util.get_hostname_fqdn(cfg, cloud).fqdn
-         mydom = ".".join(fqdn.split(".")[1:])
-         if mydom:
-             doms.append(".%s" % mydom)
-diff --git a/cloudinit/config/cc_debug.py b/cloudinit/config/cc_debug.py
-index c51818c3..a00f2823 100644
--- a/cloudinit/config/cc_debug.py
-+++ b/cloudinit/config/cc_debug.py
-@@ -95,7 +95,7 @@ def handle(name, cfg, cloud, log, args):
-         "Datasource: %s\n" % (type_utils.obj_name(cloud.datasource))
-     )
-     to_print.write("Distro: %s\n" % (type_utils.obj_name(cloud.distro)))
-    to_print.write("Hostname: %s\n" % (cloud.get_hostname(True)))
-+    to_print.write("Hostname: %s\n" % (cloud.get_hostname(True).hostname))
-     to_print.write("Instance ID: %s\n" % (cloud.get_instance_id()))
-     to_print.write("Locale: %s\n" % (cloud.get_locale()))
-     to_print.write("Launch IDX: %s\n" % (cloud.launch_index))
-diff --git a/cloudinit/config/cc_phone_home.py b/cloudinit/config/cc_phone_home.py
-index a0e1da78..1cf270aa 100644
--- a/cloudinit/config/cc_phone_home.py
-+++ b/cloudinit/config/cc_phone_home.py
-@@ -119,8 +119,8 @@ def handle(name, cfg, cloud, log, args):
- 
-     all_keys = {}
-     all_keys["instance_id"] = cloud.get_instance_id()
-    all_keys["hostname"] = cloud.get_hostname()
-    all_keys["fqdn"] = cloud.get_hostname(fqdn=True)
-+    all_keys["hostname"] = cloud.get_hostname().hostname
-+    all_keys["fqdn"] = cloud.get_hostname(fqdn=True).hostname
- 
-     pubkeys = {
-         "pub_key_dsa": "/etc/ssh/ssh_host_dsa_key.pub",
-diff --git a/cloudinit/config/cc_set_hostname.py b/cloudinit/config/cc_set_hostname.py
-index eb0ca328..2674fa20 100644
--- a/cloudinit/config/cc_set_hostname.py
-+++ b/cloudinit/config/cc_set_hostname.py
-@@ -76,7 +76,7 @@ def handle(name, cfg, cloud, log, _args):
-     if hostname_fqdn is not None:
-         cloud.distro.set_option("prefer_fqdn_over_hostname", hostname_fqdn)
- 
-    (hostname, fqdn) = util.get_hostname_fqdn(cfg, cloud)
-+    (hostname, fqdn, is_default) = util.get_hostname_fqdn(cfg, cloud)
-     # Check for previous successful invocation of set-hostname
- 
-     # set-hostname artifact file accounts for both hostname and fqdn
-@@ -94,6 +94,10 @@ def handle(name, cfg, cloud, log, _args):
-     if not hostname_changed:
-         log.debug("No hostname changes. Skipping set-hostname")
-         return
-+    if is_default and hostname == "localhost":
-+        # https://github.com/systemd/systemd/commit/d39079fcaa05e23540d2b1f0270fa31c22a7e9f1
-+        log.debug("Hostname is localhost. Let other services handle this.")
-+        return
-     log.debug("Setting the hostname to %s (%s)", fqdn, hostname)
-     try:
-         cloud.distro.set_hostname(hostname, fqdn)
-diff --git a/cloudinit/config/cc_spacewalk.py b/cloudinit/config/cc_spacewalk.py
-index 3fa6c388..419c8b32 100644
--- a/cloudinit/config/cc_spacewalk.py
-+++ b/cloudinit/config/cc_spacewalk.py
-@@ -89,7 +89,7 @@ def handle(name, cfg, cloud, log, _args):
-         if not is_registered():
-             do_register(
-                 spacewalk_server,
-                cloud.datasource.get_hostname(fqdn=True),
-+                cloud.datasource.get_hostname(fqdn=True).hostname,
-                 proxy=cfg.get("proxy"),
-                 log=log,
-                 activation_key=cfg.get("activation_key"),
-diff --git a/cloudinit/config/cc_update_etc_hosts.py b/cloudinit/config/cc_update_etc_hosts.py
-index f0aa9b0f..d2ee6f45 100644
--- a/cloudinit/config/cc_update_etc_hosts.py
-+++ b/cloudinit/config/cc_update_etc_hosts.py
-@@ -62,7 +62,7 @@ def handle(name, cfg, cloud, log, _args):
-     hosts_fn = cloud.distro.hosts_fn
- 
-     if util.translate_bool(manage_hosts, addons=["template"]):
-        (hostname, fqdn) = util.get_hostname_fqdn(cfg, cloud)
-+        (hostname, fqdn, _) = util.get_hostname_fqdn(cfg, cloud)
-         if not hostname:
-             log.warning(
-                 "Option 'manage_etc_hosts' was set, but no hostname was found"
-@@ -84,7 +84,7 @@ def handle(name, cfg, cloud, log, _args):
-         )
- 
-     elif manage_hosts == "localhost":
-        (hostname, fqdn) = util.get_hostname_fqdn(cfg, cloud)
-+        (hostname, fqdn, _) = util.get_hostname_fqdn(cfg, cloud)
-         if not hostname:
-             log.warning(
-                 "Option 'manage_etc_hosts' was set, but no hostname was found"
-diff --git a/cloudinit/config/cc_update_hostname.py b/cloudinit/config/cc_update_hostname.py
-index 09f6f6da..e2046020 100644
--- a/cloudinit/config/cc_update_hostname.py
-+++ b/cloudinit/config/cc_update_hostname.py
-@@ -56,7 +56,12 @@ def handle(name, cfg, cloud, log, _args):
-     if hostname_fqdn is not None:
-         cloud.distro.set_option("prefer_fqdn_over_hostname", hostname_fqdn)
- 
-    (hostname, fqdn) = util.get_hostname_fqdn(cfg, cloud)
-+    (hostname, fqdn, is_default) = util.get_hostname_fqdn(cfg, cloud)
-+    if is_default and hostname == "localhost":
-+        # https://github.com/systemd/systemd/commit/d39079fcaa05e23540d2b1f0270fa31c22a7e9f1
-+        log.debug("Hostname is localhost. Let other services handle this.")
-+        return
-+
-     try:
-         prev_fn = os.path.join(cloud.get_cpath("data"), "previous-hostname")
-         log.debug("Updating hostname to %s (%s)", fqdn, hostname)
-diff --git a/cloudinit/sources/DataSourceAliYun.py b/cloudinit/sources/DataSourceAliYun.py
-index 37f512e3..b9390aca 100644
--- a/cloudinit/sources/DataSourceAliYun.py
-+++ b/cloudinit/sources/DataSourceAliYun.py
-@@ -2,6 +2,7 @@
- 
- from cloudinit import dmi, sources
- from cloudinit.sources import DataSourceEc2 as EC2
-+from cloudinit.sources import DataSourceHostname
- 
- ALIYUN_PRODUCT = "Alibaba Cloud ECS"
- 
-@@ -16,7 +17,12 @@ class DataSourceAliYun(EC2.DataSourceEc2):
-     extended_metadata_versions = []
- 
-     def get_hostname(self, fqdn=False, resolve_ip=False, metadata_only=False):
-        return self.metadata.get("hostname", "localhost.localdomain")
-+        hostname = self.metadata.get("hostname")
-+        is_default = False
-+        if hostname is None:
-+            hostname = "localhost.localdomain"
-+            is_default = True
-+        return DataSourceHostname(hostname, is_default)
- 
-     def get_public_ssh_keys(self):
-         return parse_public_keys(self.metadata.get("public-keys", {}))
-diff --git a/cloudinit/sources/DataSourceCloudSigma.py b/cloudinit/sources/DataSourceCloudSigma.py
-index de71c3e9..91ebb084 100644
--- a/cloudinit/sources/DataSourceCloudSigma.py
-+++ b/cloudinit/sources/DataSourceCloudSigma.py
-@@ -11,6 +11,7 @@ from cloudinit import dmi
- from cloudinit import log as logging
- from cloudinit import sources
- from cloudinit.cs_utils import SERIAL_PORT, Cepko
-+from cloudinit.sources import DataSourceHostname
- 
- LOG = logging.getLogger(__name__)
- 
-@@ -90,9 +91,10 @@ class DataSourceCloudSigma(sources.DataSource):
-         the first part from uuid is being used.
-         """
-         if re.match(r"^[A-Za-z0-9 -_\.]+$", self.metadata["name"]):
-            return self.metadata["name"][:61]
-+            ret = self.metadata["name"][:61]
-         else:
-            return self.metadata["uuid"].split("-")[0]
-+            ret = self.metadata["uuid"].split("-")[0]
-+        return DataSourceHostname(ret, False)
- 
-     def get_public_ssh_keys(self):
-         return [self.ssh_public_key]
-diff --git a/cloudinit/sources/DataSourceGCE.py b/cloudinit/sources/DataSourceGCE.py
-index c470bea8..f7ec6b52 100644
--- a/cloudinit/sources/DataSourceGCE.py
-+++ b/cloudinit/sources/DataSourceGCE.py
-@@ -12,6 +12,7 @@ from cloudinit import log as logging
- from cloudinit import sources, url_helper, util
- from cloudinit.distros import ug_util
- from cloudinit.net.dhcp import EphemeralDHCPv4
-+from cloudinit.sources import DataSourceHostname
- 
- LOG = logging.getLogger(__name__)
- 
-@@ -122,7 +123,9 @@ class DataSourceGCE(sources.DataSource):
- 
-     def get_hostname(self, fqdn=False, resolve_ip=False, metadata_only=False):
-         # GCE has long FDQN's and has asked for short hostnames.
-        return self.metadata["local-hostname"].split(".")[0]
-+        return DataSourceHostname(
-+            self.metadata["local-hostname"].split(".")[0], False
-+        )
- 
-     @property
-     def availability_zone(self):
-diff --git a/cloudinit/sources/DataSourceScaleway.py b/cloudinit/sources/DataSourceScaleway.py
-index 8e5dd82c..8f08dc6d 100644
--- a/cloudinit/sources/DataSourceScaleway.py
-+++ b/cloudinit/sources/DataSourceScaleway.py
-@@ -30,6 +30,7 @@ from cloudinit import log as logging
- from cloudinit import net, sources, url_helper, util
- from cloudinit.event import EventScope, EventType
- from cloudinit.net.dhcp import EphemeralDHCPv4, NoDHCPLeaseError
-+from cloudinit.sources import DataSourceHostname
- 
- LOG = logging.getLogger(__name__)
- 
-@@ -282,7 +283,7 @@ class DataSourceScaleway(sources.DataSource):
-         return ssh_keys
- 
-     def get_hostname(self, fqdn=False, resolve_ip=False, metadata_only=False):
-        return self.metadata["hostname"]
-+        return DataSourceHostname(self.metadata["hostname"], False)
- 
-     @property
-     def availability_zone(self):
-diff --git a/cloudinit/sources/__init__.py b/cloudinit/sources/__init__.py
-index 88028cfa..77b24fd7 100644
--- a/cloudinit/sources/__init__.py
-+++ b/cloudinit/sources/__init__.py
-@@ -148,6 +148,11 @@ URLParams = namedtuple(
-     ],
- )
- 
-+DataSourceHostname = namedtuple(
-+    "DataSourceHostname",
-+    ["hostname", "is_default"],
-+)
-+
- 
- class DataSource(CloudInitPickleMixin, metaclass=abc.ABCMeta):
- 
-@@ -291,7 +296,7 @@ class DataSource(CloudInitPickleMixin, metaclass=abc.ABCMeta):
- 
-     def _get_standardized_metadata(self, instance_data):
-         """Return a dictionary of standardized metadata keys."""
-        local_hostname = self.get_hostname()
-+        local_hostname = self.get_hostname().hostname
-         instance_id = self.get_instance_id()
-         availability_zone = self.availability_zone
-         # In the event of upgrade from existing cloudinit, pickled datasource
-@@ -697,22 +702,33 @@ class DataSource(CloudInitPickleMixin, metaclass=abc.ABCMeta):
-         @param metadata_only: Boolean, set True to avoid looking up hostname
-             if meta-data doesn't have local-hostname present.
- 
-        @return: hostname or qualified hostname. Optionally return None when
-+        @return: a DataSourceHostname namedtuple
-+            <hostname or qualified hostname>, <is_default> (str, bool).
-+            is_default is a bool and
-+            it's true only if hostname is localhost and was
-+            returned by util.get_hostname() as a default.
-+            This is used to differentiate with a user-defined
-+            localhost hostname.
-+            Optionally return (None, False) when
-             metadata_only is True and local-hostname data is not available.
-         """
-         defdomain = "localdomain"
-         defhost = "localhost"
-         domain = defdomain
-+        is_default = False
- 
-         if not self.metadata or not self.metadata.get("local-hostname"):
-             if metadata_only:
-                return None
-+                return DataSourceHostname(None, is_default)
-             # this is somewhat questionable really.
-             # the cloud datasource was asked for a hostname
-             # and didn't have one. raising error might be more appropriate
-             # but instead, basically look up the existing hostname
-             toks = []
-             hostname = util.get_hostname()
-+            if hostname == "localhost":
-+                # default hostname provided by socket.gethostname()
-+                is_default = True
-             hosts_fqdn = util.get_fqdn_from_hosts(hostname)
-             if hosts_fqdn and hosts_fqdn.find(".") > 0:
-                 toks = str(hosts_fqdn).split(".")
-@@ -745,9 +761,9 @@ class DataSource(CloudInitPickleMixin, metaclass=abc.ABCMeta):
-             hostname = toks[0]
- 
-         if fqdn and domain != defdomain:
-            return "%s.%s" % (hostname, domain)
-        else:
-            return hostname
-+            hostname = "%s.%s" % (hostname, domain)
-+
-+        return DataSourceHostname(hostname, is_default)
- 
-     def get_package_mirror_info(self):
-         return self.distro.get_package_mirror_info(data_source=self)
-diff --git a/cloudinit/util.py b/cloudinit/util.py
-index 569fc215..4cb21551 100644
--- a/cloudinit/util.py
-+++ b/cloudinit/util.py
-@@ -32,7 +32,8 @@ import subprocess
- import sys
- import time
- from base64 import b64decode, b64encode
-from errno import ENOENT
-+from collections import deque, namedtuple
-+from errno import EACCES, ENOENT
- from functools import lru_cache
- from typing import List
- from urllib import parse
-@@ -1072,6 +1073,12 @@ def dos2unix(contents):
-     return contents.replace("\r\n", "\n")
- 
- 
-+HostnameFqdnInfo = namedtuple(
-+    "HostnameFqdnInfo",
-+    ["hostname", "fqdn", "is_default"],
-+)
-+
-+
- def get_hostname_fqdn(cfg, cloud, metadata_only=False):
-     """Get hostname and fqdn from config if present and fallback to cloud.
- 
-@@ -1079,9 +1086,17 @@ def get_hostname_fqdn(cfg, cloud, metadata_only=False):
-     @param cloud: Cloud instance from init.cloudify().
-     @param metadata_only: Boolean, set True to only query cloud meta-data,
-         returning None if not present in meta-data.
-    @return: a Tuple of strings <hostname>, <fqdn>. Values can be none when
-+    @return: a namedtuple of
-+        <hostname>, <fqdn>, <is_default> (str, str, bool).
-+        Values can be none when
-         metadata_only is True and no cfg or metadata provides hostname info.
-+        is_default is a bool and
-+        it's true only if hostname is localhost and was
-+        returned by util.get_hostname() as a default.
-+        This is used to differentiate with a user-defined
-+        localhost hostname.
-     """
-+    is_default = False
-     if "fqdn" in cfg:
-         # user specified a fqdn.  Default hostname then is based off that
-         fqdn = cfg["fqdn"]
-@@ -1095,12 +1110,16 @@ def get_hostname_fqdn(cfg, cloud, metadata_only=False):
-         else:
-             # no fqdn set, get fqdn from cloud.
-             # get hostname from cfg if available otherwise cloud
-            fqdn = cloud.get_hostname(fqdn=True, metadata_only=metadata_only)
-+            fqdn = cloud.get_hostname(
-+                fqdn=True, metadata_only=metadata_only
-+            ).hostname
-             if "hostname" in cfg:
-                 hostname = cfg["hostname"]
-             else:
-                hostname = cloud.get_hostname(metadata_only=metadata_only)
-    return (hostname, fqdn)
-+                hostname, is_default = cloud.get_hostname(
-+                    metadata_only=metadata_only
-+                )
-+    return HostnameFqdnInfo(hostname, fqdn, is_default)
- 
- 
- def get_fqdn_from_hosts(hostname, filename="/etc/hosts"):
-diff --git a/tests/unittests/config/test_cc_set_hostname.py b/tests/unittests/config/test_cc_set_hostname.py
-index fd994c4e..3d1d86ee 100644
--- a/tests/unittests/config/test_cc_set_hostname.py
-+++ b/tests/unittests/config/test_cc_set_hostname.py
-@@ -11,6 +11,7 @@ from configobj import ConfigObj
- 
- from cloudinit import cloud, distros, helpers, util
- from cloudinit.config import cc_set_hostname
-+from cloudinit.sources import DataSourceNone
- from tests.unittests import helpers as t_help
- 
- LOG = logging.getLogger(__name__)
-@@ -153,7 +154,8 @@ class TestHostname(t_help.FilesystemMockingTestCase):
-                     )
-                 ] not in m_subp.call_args_list
- 
-    def test_multiple_calls_skips_unchanged_hostname(self):
-+    @mock.patch("cloudinit.util.get_hostname", return_value="localhost")
-+    def test_multiple_calls_skips_unchanged_hostname(self, get_hostname):
-         """Only new hostname or fqdn values will generate a hostname call."""
-         distro = self._fetch_distro("debian")
-         paths = helpers.Paths({"cloud_dir": self.tmp})
-@@ -182,6 +184,42 @@ class TestHostname(t_help.FilesystemMockingTestCase):
-             self.logs.getvalue(),
-         )
- 
-+    @mock.patch("cloudinit.util.get_hostname", return_value="localhost")
-+    def test_localhost_default_hostname(self, get_hostname):
-+        """
-+        No hostname set. Default value returned is localhost,
-+        but we shouldn't write it in /etc/hostname
-+        """
-+        distro = self._fetch_distro("debian")
-+        paths = helpers.Paths({"cloud_dir": self.tmp})
-+        ds = DataSourceNone.DataSourceNone({}, None, paths)
-+        cc = cloud.Cloud(ds, paths, {}, distro, None)
-+        self.patchUtils(self.tmp)
-+
-+        util.write_file("/etc/hostname", "")
-+        cc_set_hostname.handle("cc_set_hostname", {}, cc, LOG, [])
-+        contents = util.load_file("/etc/hostname")
-+        self.assertEqual("", contents.strip())
-+
-+    @mock.patch("cloudinit.util.get_hostname", return_value="localhost")
-+    def test_localhost_user_given_hostname(self, get_hostname):
-+        """
-+        User set hostname is localhost. We should write it in /etc/hostname
-+        """
-+        distro = self._fetch_distro("debian")
-+        paths = helpers.Paths({"cloud_dir": self.tmp})
-+        ds = DataSourceNone.DataSourceNone({}, None, paths)
-+        cc = cloud.Cloud(ds, paths, {}, distro, None)
-+        self.patchUtils(self.tmp)
-+
-+        # user-provided localhost should not be ignored
-+        util.write_file("/etc/hostname", "")
-+        cc_set_hostname.handle(
-+            "cc_set_hostname", {"hostname": "localhost"}, cc, LOG, []
-+        )
-+        contents = util.load_file("/etc/hostname")
-+        self.assertEqual("localhost", contents.strip())
-+
-     def test_error_on_distro_set_hostname_errors(self):
-         """Raise SetHostnameError on exceptions from distro.set_hostname."""
-         distro = self._fetch_distro("debian")
-diff --git a/tests/unittests/sources/test_aliyun.py b/tests/unittests/sources/test_aliyun.py
-index 8a61d5ee..e628dc02 100644
--- a/tests/unittests/sources/test_aliyun.py
-+++ b/tests/unittests/sources/test_aliyun.py
-@@ -149,7 +149,7 @@ class TestAliYunDatasource(test_helpers.HttprettyTestCase):
- 
-     def _test_host_name(self):
-         self.assertEqual(
-            self.default_metadata["hostname"], self.ds.get_hostname()
-+            self.default_metadata["hostname"], self.ds.get_hostname().hostname
-         )
- 
-     @mock.patch("cloudinit.sources.DataSourceAliYun._is_aliyun")
-diff --git a/tests/unittests/sources/test_cloudsigma.py b/tests/unittests/sources/test_cloudsigma.py
-index a2f26245..3dca7ea8 100644
--- a/tests/unittests/sources/test_cloudsigma.py
-+++ b/tests/unittests/sources/test_cloudsigma.py
-@@ -58,12 +58,14 @@ class DataSourceCloudSigmaTest(test_helpers.CiTestCase):
- 
-     def test_get_hostname(self):
-         self.datasource.get_data()
-        self.assertEqual("test_server", self.datasource.get_hostname())
-+        self.assertEqual(
-+            "test_server", self.datasource.get_hostname().hostname
-+        )
-         self.datasource.metadata["name"] = ""
-        self.assertEqual("65b2fb23", self.datasource.get_hostname())
-+        self.assertEqual("65b2fb23", self.datasource.get_hostname().hostname)
-         utf8_hostname = b"\xd1\x82\xd0\xb5\xd1\x81\xd1\x82".decode("utf-8")
-         self.datasource.metadata["name"] = utf8_hostname
-        self.assertEqual("65b2fb23", self.datasource.get_hostname())
-+        self.assertEqual("65b2fb23", self.datasource.get_hostname().hostname)
- 
-     def test_get_public_ssh_keys(self):
-         self.datasource.get_data()
-diff --git a/tests/unittests/sources/test_digitalocean.py b/tests/unittests/sources/test_digitalocean.py
-index f3e6224e..47e46c66 100644
--- a/tests/unittests/sources/test_digitalocean.py
-+++ b/tests/unittests/sources/test_digitalocean.py
-@@ -178,7 +178,7 @@ class TestDataSourceDigitalOcean(CiTestCase):
-         self.assertEqual(DO_META.get("vendor_data"), ds.get_vendordata_raw())
-         self.assertEqual(DO_META.get("region"), ds.availability_zone)
-         self.assertEqual(DO_META.get("droplet_id"), ds.get_instance_id())
-        self.assertEqual(DO_META.get("hostname"), ds.get_hostname())
-+        self.assertEqual(DO_META.get("hostname"), ds.get_hostname().hostname)
- 
-         # Single key
-         self.assertEqual(
-diff --git a/tests/unittests/sources/test_gce.py b/tests/unittests/sources/test_gce.py
-index e030931b..1ce0c6ec 100644
--- a/tests/unittests/sources/test_gce.py
-+++ b/tests/unittests/sources/test_gce.py
-@@ -126,7 +126,7 @@ class TestDataSourceGCE(test_helpers.HttprettyTestCase):
-         self.ds.get_data()
- 
-         shostname = GCE_META.get("instance/hostname").split(".")[0]
-        self.assertEqual(shostname, self.ds.get_hostname())
-+        self.assertEqual(shostname, self.ds.get_hostname().hostname)
- 
-         self.assertEqual(
-             GCE_META.get("instance/id"), self.ds.get_instance_id()
-@@ -147,7 +147,7 @@ class TestDataSourceGCE(test_helpers.HttprettyTestCase):
-         )
- 
-         shostname = GCE_META_PARTIAL.get("instance/hostname").split(".")[0]
-        self.assertEqual(shostname, self.ds.get_hostname())
-+        self.assertEqual(shostname, self.ds.get_hostname().hostname)
- 
-     def test_userdata_no_encoding(self):
-         """check that user-data is read."""
-diff --git a/tests/unittests/sources/test_hetzner.py b/tests/unittests/sources/test_hetzner.py
-index f80ed45f..193b7e42 100644
--- a/tests/unittests/sources/test_hetzner.py
-+++ b/tests/unittests/sources/test_hetzner.py
-@@ -116,7 +116,7 @@ class TestDataSourceHetzner(CiTestCase):
- 
-         self.assertTrue(m_readmd.called)
- 
-        self.assertEqual(METADATA.get("hostname"), ds.get_hostname())
-+        self.assertEqual(METADATA.get("hostname"), ds.get_hostname().hostname)
- 
-         self.assertEqual(METADATA.get("public-keys"), ds.get_public_ssh_keys())
- 
-diff --git a/tests/unittests/sources/test_init.py b/tests/unittests/sources/test_init.py
-index ce8fc970..79fc9c5b 100644
--- a/tests/unittests/sources/test_init.py
-+++ b/tests/unittests/sources/test_init.py
-@@ -272,9 +272,11 @@ class TestDataSource(CiTestCase):
-         self.assertEqual(
-             "test-subclass-hostname", datasource.metadata["local-hostname"]
-         )
-        self.assertEqual("test-subclass-hostname", datasource.get_hostname())
-+        self.assertEqual(
-+            "test-subclass-hostname", datasource.get_hostname().hostname
-+        )
-         datasource.metadata["local-hostname"] = "hostname.my.domain.com"
-        self.assertEqual("hostname", datasource.get_hostname())
-+        self.assertEqual("hostname", datasource.get_hostname().hostname)
- 
-     def test_get_hostname_with_fqdn_returns_local_hostname_with_domain(self):
-         """Datasource.get_hostname with fqdn set gets qualified hostname."""
-@@ -285,7 +287,8 @@ class TestDataSource(CiTestCase):
-         self.assertTrue(datasource.get_data())
-         datasource.metadata["local-hostname"] = "hostname.my.domain.com"
-         self.assertEqual(
-            "hostname.my.domain.com", datasource.get_hostname(fqdn=True)
-+            "hostname.my.domain.com",
-+            datasource.get_hostname(fqdn=True).hostname,
-         )
- 
-     def test_get_hostname_without_metadata_uses_system_hostname(self):
-@@ -300,10 +303,12 @@ class TestDataSource(CiTestCase):
-             with mock.patch(mock_fqdn) as m_fqdn:
-                 m_gethost.return_value = "systemhostname.domain.com"
-                 m_fqdn.return_value = None  # No maching fqdn in /etc/hosts
-                self.assertEqual("systemhostname", datasource.get_hostname())
-+                self.assertEqual(
-+                    "systemhostname", datasource.get_hostname().hostname
-+                )
-                 self.assertEqual(
-                     "systemhostname.domain.com",
-                    datasource.get_hostname(fqdn=True),
-+                    datasource.get_hostname(fqdn=True).hostname,
-                 )
- 
-     def test_get_hostname_without_metadata_returns_none(self):
-@@ -316,9 +321,13 @@ class TestDataSource(CiTestCase):
-         mock_fqdn = "cloudinit.sources.util.get_fqdn_from_hosts"
-         with mock.patch("cloudinit.sources.util.get_hostname") as m_gethost:
-             with mock.patch(mock_fqdn) as m_fqdn:
-                self.assertIsNone(datasource.get_hostname(metadata_only=True))
-                 self.assertIsNone(
-                    datasource.get_hostname(fqdn=True, metadata_only=True)
-+                    datasource.get_hostname(metadata_only=True).hostname
-+                )
-+                self.assertIsNone(
-+                    datasource.get_hostname(
-+                        fqdn=True, metadata_only=True
-+                    ).hostname
-                 )
-         self.assertEqual([], m_gethost.call_args_list)
-         self.assertEqual([], m_fqdn.call_args_list)
-@@ -335,10 +344,12 @@ class TestDataSource(CiTestCase):
-             with mock.patch(mock_fqdn) as m_fqdn:
-                 m_gethost.return_value = "systemhostname.domain.com"
-                 m_fqdn.return_value = "fqdnhostname.domain.com"
-                self.assertEqual("fqdnhostname", datasource.get_hostname())
-+                self.assertEqual(
-+                    "fqdnhostname", datasource.get_hostname().hostname
-+                )
-                 self.assertEqual(
-                     "fqdnhostname.domain.com",
-                    datasource.get_hostname(fqdn=True),
-+                    datasource.get_hostname(fqdn=True).hostname,
-                 )
- 
-     def test_get_data_does_not_write_instance_data_on_failure(self):
-diff --git a/tests/unittests/sources/test_scaleway.py b/tests/unittests/sources/test_scaleway.py
-index d7e8b969..56735dd0 100644
--- a/tests/unittests/sources/test_scaleway.py
-+++ b/tests/unittests/sources/test_scaleway.py
-@@ -236,7 +236,7 @@ class TestDataSourceScaleway(HttprettyTestCase):
-             ].sort(),
-         )
-         self.assertEqual(
-            self.datasource.get_hostname(),
-+            self.datasource.get_hostname().hostname,
-             MetadataResponses.FAKE_METADATA["hostname"],
-         )
-         self.assertEqual(
-diff --git a/tests/unittests/sources/test_vmware.py b/tests/unittests/sources/test_vmware.py
-index dd331349..753bb774 100644
--- a/tests/unittests/sources/test_vmware.py
-+++ b/tests/unittests/sources/test_vmware.py
-@@ -368,7 +368,9 @@ class TestDataSourceVMwareGuestInfo_InvalidPlatform(FilesystemMockingTestCase):
- 
- def assert_metadata(test_obj, ds, metadata):
-     test_obj.assertEqual(metadata.get("instance-id"), ds.get_instance_id())
-    test_obj.assertEqual(metadata.get("local-hostname"), ds.get_hostname())
-+    test_obj.assertEqual(
-+        metadata.get("local-hostname"), ds.get_hostname().hostname
-+    )
- 
-     expected_public_keys = metadata.get("public_keys")
-     if not isinstance(expected_public_keys, list):
-diff --git a/tests/unittests/test_util.py b/tests/unittests/test_util.py
-index 3765511b..528b7f36 100644
--- a/tests/unittests/test_util.py
-+++ b/tests/unittests/test_util.py
-@@ -19,6 +19,7 @@ import pytest
- import yaml
- 
- from cloudinit import importer, subp, util
-+from cloudinit.sources import DataSourceHostname
- from tests.unittests import helpers
- from tests.unittests.helpers import CiTestCase
- 
-@@ -331,8 +332,8 @@ class FakeCloud(object):
-             myargs["metadata_only"] = metadata_only
-         self.calls.append(myargs)
-         if fqdn:
-            return self.fqdn
-        return self.hostname
-+            return DataSourceHostname(self.fqdn, False)
-+        return DataSourceHostname(self.hostname, False)
- 
- 
- class TestUtil(CiTestCase):
-@@ -420,7 +421,7 @@ class TestShellify(CiTestCase):
- class TestGetHostnameFqdn(CiTestCase):
-     def test_get_hostname_fqdn_from_only_cfg_fqdn(self):
-         """When cfg only has the fqdn key, derive hostname and fqdn from it."""
-        hostname, fqdn = util.get_hostname_fqdn(
-+        hostname, fqdn, _ = util.get_hostname_fqdn(
-             cfg={"fqdn": "myhost.domain.com"}, cloud=None
-         )
-         self.assertEqual("myhost", hostname)
-@@ -428,7 +429,7 @@ class TestGetHostnameFqdn(CiTestCase):
- 
-     def test_get_hostname_fqdn_from_cfg_fqdn_and_hostname(self):
-         """When cfg has both fqdn and hostname keys, return them."""
-        hostname, fqdn = util.get_hostname_fqdn(
-+        hostname, fqdn, _ = util.get_hostname_fqdn(
-             cfg={"fqdn": "myhost.domain.com", "hostname": "other"}, cloud=None
-         )
-         self.assertEqual("other", hostname)
-@@ -436,7 +437,7 @@ class TestGetHostnameFqdn(CiTestCase):
- 
-     def test_get_hostname_fqdn_from_cfg_hostname_with_domain(self):
-         """When cfg has only hostname key which represents a fqdn, use that."""
-        hostname, fqdn = util.get_hostname_fqdn(
-+        hostname, fqdn, _ = util.get_hostname_fqdn(
-             cfg={"hostname": "myhost.domain.com"}, cloud=None
-         )
-         self.assertEqual("myhost", hostname)
-@@ -445,7 +446,7 @@ class TestGetHostnameFqdn(CiTestCase):
-     def test_get_hostname_fqdn_from_cfg_hostname_without_domain(self):
-         """When cfg has a hostname without a '.' query cloud.get_hostname."""
-         mycloud = FakeCloud("cloudhost", "cloudhost.mycloud.com")
-        hostname, fqdn = util.get_hostname_fqdn(
-+        hostname, fqdn, _ = util.get_hostname_fqdn(
-             cfg={"hostname": "myhost"}, cloud=mycloud
-         )
-         self.assertEqual("myhost", hostname)
-@@ -457,7 +458,7 @@ class TestGetHostnameFqdn(CiTestCase):
-     def test_get_hostname_fqdn_from_without_fqdn_or_hostname(self):
-         """When cfg has neither hostname nor fqdn cloud.get_hostname."""
-         mycloud = FakeCloud("cloudhost", "cloudhost.mycloud.com")
-        hostname, fqdn = util.get_hostname_fqdn(cfg={}, cloud=mycloud)
-+        hostname, fqdn, _ = util.get_hostname_fqdn(cfg={}, cloud=mycloud)
-         self.assertEqual("cloudhost", hostname)
-         self.assertEqual("cloudhost.mycloud.com", fqdn)
-         self.assertEqual(
-@@ -468,7 +469,7 @@ class TestGetHostnameFqdn(CiTestCase):
-     def test_get_hostname_fqdn_from_passes_metadata_only_to_cloud(self):
-         """Calls to cloud.get_hostname pass the metadata_only parameter."""
-         mycloud = FakeCloud("cloudhost", "cloudhost.mycloud.com")
-        _hn, _fqdn = util.get_hostname_fqdn(
-+        _hn, _fqdn, _def_hostname = util.get_hostname_fqdn(
-             cfg={}, cloud=mycloud, metadata_only=True
-         )
-         self.assertEqual(
-diff --git a/tests/unittests/util.py b/tests/unittests/util.py
-index 79a6e1d0..6fb39506 100644
--- a/tests/unittests/util.py
-+++ b/tests/unittests/util.py
-@@ -1,5 +1,6 @@
- # This file is part of cloud-init. See LICENSE file for license information.
- from cloudinit import cloud, distros, helpers
-+from cloudinit.sources import DataSourceHostname
- from cloudinit.sources.DataSourceNone import DataSourceNone
- 
- 
-@@ -37,7 +38,7 @@ def abstract_to_concrete(abclass):
- 
- class DataSourceTesting(DataSourceNone):
-     def get_hostname(self, fqdn=False, resolve_ip=False, metadata_only=False):
-        return "hostname"
-+        return DataSourceHostname("hostname", False)
- 
-     def persist_instance_data(self):
-         return True
-- 
-2.31.1
-
--- a/SOURCES/ci-cc_set_hostname-ignore-var-lib-cloud-data-set-hostna.patch
+++ b/SOURCES/ci-cc_set_hostname-ignore-var-lib-cloud-data-set-hostna.patch
@ -1,84 +0,0 @@
-From c7ad2c8d1ddddcb9acaa1ffebb8e3b9752201f91 Mon Sep 17 00:00:00 2001
-From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-Date: Tue, 31 Jan 2023 15:28:33 +0100
-Subject: [PATCH] cc_set_hostname: ignore /var/lib/cloud/data/set-hostname if
- it's empty (#1967)
-
-RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-RH-MergeRequest: 89: cc_set_hostname: ignore /var/lib/cloud/data/set-hostname if it's empty (#1967)
-RH-Bugzilla: 2165942
-RH-Acked-by: Mohamed Gamal Morsy <mmorsy@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [1/1] 53809c47b4d7f5b30cbeb2903a48f1ee42f68c53
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2165942
-
-commit 9c7502a801763520639c66125eb373123d1e4f44
-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-Date:   Wed Jan 18 17:55:16 2023 +0100
-
-    cc_set_hostname: ignore /var/lib/cloud/data/set-hostname if it's empty (#1967)
-
-    If the file exists but is empty, do nothing.
-    Otherwise cloud-init will crash because it does not handle the empty file.
-
-    RHBZ: 2140893
-
-    Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-
-Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
---
- cloudinit/config/cc_set_hostname.py            |  2 +-
- tests/unittests/config/test_cc_set_hostname.py | 17 +++++++++++++++++
- 2 files changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/cloudinit/config/cc_set_hostname.py b/cloudinit/config/cc_set_hostname.py
-index 2674fa20..7e3d5b74 100644
--- a/cloudinit/config/cc_set_hostname.py
-+++ b/cloudinit/config/cc_set_hostname.py
-@@ -86,7 +86,7 @@ def handle(name, cfg, cloud, log, _args):
-     # distro._read_hostname implementation so we only validate  one artifact.
-     prev_fn = os.path.join(cloud.get_cpath("data"), "set-hostname")
-     prev_hostname = {}
-    if os.path.exists(prev_fn):
-+    if os.path.exists(prev_fn) and os.stat(prev_fn).st_size > 0:
-         prev_hostname = util.load_json(util.load_file(prev_fn))
-     hostname_changed = hostname != prev_hostname.get(
-         "hostname"
-diff --git a/tests/unittests/config/test_cc_set_hostname.py b/tests/unittests/config/test_cc_set_hostname.py
-index 3d1d86ee..2c92949f 100644
--- a/tests/unittests/config/test_cc_set_hostname.py
-+++ b/tests/unittests/config/test_cc_set_hostname.py
-@@ -5,6 +5,7 @@ import os
- import shutil
- import tempfile
- from io import BytesIO
-+from pathlib import Path
- from unittest import mock
- 
- from configobj import ConfigObj
-@@ -242,5 +243,21 @@ class TestHostname(t_help.FilesystemMockingTestCase):
-             str(ctx_mgr.exception),
-         )
- 
-+    def test_ignore_empty_previous_artifact_file(self):
-+        cfg = {
-+            "hostname": "blah",
-+            "fqdn": "blah.blah.blah.yahoo.com",
-+        }
-+        distro = self._fetch_distro("debian")
-+        paths = helpers.Paths({"cloud_dir": self.tmp})
-+        ds = None
-+        cc = cloud.Cloud(ds, paths, {}, distro, None)
-+        self.patchUtils(self.tmp)
-+        prev_fn = Path(cc.get_cpath("data")) / "set-hostname"
-+        prev_fn.touch()
-+        cc_set_hostname.handle("cc_set_hostname", cfg, cc, LOG, [])
-+        contents = util.load_file("/etc/hostname")
-+        self.assertEqual("blah", contents.strip())
-+
- 
- # vi: ts=4 expandtab
-- 
-2.39.1
-
--- a/SOURCES/ci-ci-Pin-pytest-8.0.0.-4816.patch
+++ b/SOURCES/ci-ci-Pin-pytest-8.0.0.-4816.patch
@ -0,0 +1,51 @@
+From 3f138f68a36224dcefd5c16befbc00486b09c8ec Mon Sep 17 00:00:00 2001
+From: Brett Holman <brett.holman@canonical.com>
+Date: Mon, 29 Jan 2024 12:03:36 -0700
+Subject: [PATCH 1/2] ci: Pin pytest<8.0.0. (#4816)
+
+RH-Author: Cathy Avery <cavery@redhat.com>
+RH-MergeRequest: 123: fix: Add types to network v1 schema (#4841)
+RH-Jira: RHEL-21323
+RH-Acked-by: Ani Sinha <None>
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Commit: [1/2] db0348f73893a7bb536e4a3562dc7ef33b2590ad
+
+The latest pytest release broke some tests in non-obvious ways. Pin
+the version for now so that CI passes.
+
+(cherry picked from commit 7c96c9cd9318e816ce4564b58a2c98271363c447)
+Signed-off-by: Cathy Avery <cavery@redhat.com>
+---
+ integration-requirements.txt | 2 +-
+ test-requirements.txt        | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/integration-requirements.txt b/integration-requirements.txt
+index 1f8b54a5..c0792d63 100644
+--- a/integration-requirements.txt
+++ b/integration-requirements.txt
+@@ -7,7 +7,7 @@ pycloudlib>=5.10.0,<1!6
+ # test/unittests/conftest.py to be loaded by our integration-tests tox env
+ # resulting in an unmet dependency issue:
+ # https://github.com/pytest-dev/pytest/issues/11104
+-pytest!=7.3.2
+pytest!=7.3.2,<8.0.0
+ 
+ packaging
+ passlib
+diff --git a/test-requirements.txt b/test-requirements.txt
+index 46a98b4c..3d2480fd 100644
+--- a/test-requirements.txt
+++ b/test-requirements.txt
+@@ -4,7 +4,7 @@
+ # test/unittests/conftest.py to be loaded by our integration-tests tox env
+ # resulting in an unmet dependency issue:
+ # https://github.com/pytest-dev/pytest/issues/11104
+-pytest!=7.3.2
+pytest!=7.3.2,<8.0.0
+ 
+ pytest-cov
+ pytest-mock
+-- 
+2.39.3
+
--- a/SOURCES/ci-fix-Add-types-to-network-v1-schema-4841.patch
+++ b/SOURCES/ci-fix-Add-types-to-network-v1-schema-4841.patch
@ -0,0 +1,110 @@
+From 720faf533832ba758dcc8436f144168996508c2a Mon Sep 17 00:00:00 2001
+From: James Falcon <james.falcon@canonical.com>
+Date: Tue, 6 Feb 2024 09:24:37 -0600
+Subject: [PATCH 2/2] fix: Add types to network v1 schema (#4841)
+
+RH-Author: Cathy Avery <cavery@redhat.com>
+RH-MergeRequest: 123: fix: Add types to network v1 schema (#4841)
+RH-Jira: RHEL-21323
+RH-Acked-by: Ani Sinha <None>
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Commit: [2/2] a73a68dff5a6ef54dc4e3b3527fc778400a461cc
+
+Conflicts:
+For RHEL no log argument as we are not including commit e168b4a1383b6eae9c1dc81411d7684fcbbf7df9
+
+Even though it has conflicted with our documentation, we have allowed
+nameserver address to a be a string, mtu to be empty, and nameserver
+search to be missing. Since we have allowed these, expand our schema
+and documentation accordingly.
+
+Fixes GH-4710
+
+(cherry picked from commit b08193b376552ede5d162d8283310adc783d81bf)
+Signed-off-by: Cathy Avery <cavery@redhat.com>
+---
+ .../config/schemas/schema-network-config-v1.json    | 13 +++++++++----
+ doc/rtd/reference/network-config-format-v1.rst      |  4 ++--
+ tests/unittests/config/test_schema.py               | 13 +++++++++++++
+ 3 files changed, 24 insertions(+), 6 deletions(-)
+
+diff --git a/cloudinit/config/schemas/schema-network-config-v1.json b/cloudinit/config/schemas/schema-network-config-v1.json
+index c77885ec..56dc27c9 100644
+--- a/cloudinit/config/schemas/schema-network-config-v1.json
+++ b/cloudinit/config/schemas/schema-network-config-v1.json
+@@ -24,7 +24,10 @@
+           "description": "The lowercase MAC address of the physical device."
+         },
+         "mtu": {
+-          "type": "integer",
+          "type": [
+            "integer",
+            "null"
+          ],
+           "description": "The MTU size in bytes. The ``mtu`` key represents a device's Maximum Transmission Unit, which is the largest size packet or frame, specified in octets (eight-bit bytes), that can be sent in a packet- or frame-based network. Specifying ``mtu`` is optional. Values too small or too large for a device may be ignored by that device."
+         },
+         "subnets": {
+@@ -384,8 +387,7 @@
+       "additionalProperties": false,
+       "required": [
+         "type",
+-        "address",
+-        "search"
+        "address"
+       ],
+       "properties": {
+         "type": {
+@@ -396,7 +398,10 @@
+         },
+         "address": {
+           "description": "List of IPv4 or IPv6 address of nameservers.",
+-          "type": "array",
+          "type": [
+            "array",
+            "string"
+          ],
+           "items": {
+             "type": "string"
+           }
+diff --git a/doc/rtd/reference/network-config-format-v1.rst b/doc/rtd/reference/network-config-format-v1.rst
+index d267eb94..42f2dc22 100644
+--- a/doc/rtd/reference/network-config-format-v1.rst
+++ b/doc/rtd/reference/network-config-format-v1.rst
+@@ -252,8 +252,8 @@ Users can specify a ``nameserver`` type. Nameserver dictionaries include
+ the following keys:
+ 
+ - ``address``: List of IPv4 or IPv6 address of nameservers.
+-- ``search``: List of hostnames to include in the :file:`resolv.conf` search
+-  path.
+- ``search``: Optional. List of hostnames to include in the :file:`resolv.conf`
+  search path.
+ - ``interface``: Optional. Ties the nameserver definition to the specified
+   interface. The value specified here must match the ``name`` of an interface
+   defined in this config. If unspecified, this nameserver will be considered
+diff --git a/tests/unittests/config/test_schema.py b/tests/unittests/config/test_schema.py
+index 28f0b39d..52667332 100644
+--- a/tests/unittests/config/test_schema.py
+++ b/tests/unittests/config/test_schema.py
+@@ -2048,6 +2048,19 @@ class TestNetworkSchema:
+                 does_not_raise(),
+                 id="bond_with_all_known_properties",
+             ),
+            pytest.param(
+                {
+                    "network": {
+                        "version": 1,
+                        "config": [
+                            {"type": "physical", "name": "eth0", "mtu": None},
+                            {"type": "nameserver", "address": "8.8.8.8"},
+                        ],
+                    }
+                },
+                does_not_raise(),
+                id="GH-4710_mtu_none_and_str_address",
+            ),
+         ),
+     )
+     def test_network_schema(self, src_config, expectation):
+-- 
+2.39.3
+
--- a/SOURCES/ci-fix-clean-stop-warning-when-running-clean-command-47.patch
+++ b/SOURCES/ci-fix-clean-stop-warning-when-running-clean-command-47.patch
@ -0,0 +1,132 @@
+From a622a094a1f497c87a66932382265c2dbf1b88a2 Mon Sep 17 00:00:00 2001
+From: d1r3ct0r <calvin.mwadime@canonical.com>
+Date: Sat, 20 Jan 2024 02:11:47 +0300
+Subject: [PATCH 1/2] fix(clean): stop warning when running clean command
+ (#4761)
+
+RH-Author: Ani Sinha <None>
+RH-MergeRequest: 121: fix(clean): stop warning when running clean command (#4761)
+RH-Jira: RHEL-21530
+RH-Acked-by: Cathy Avery <cavery@redhat.com>
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Commit: [1/2] f7a20c627afabf00db20c80ecd6e7f577053863b
+
+When the clean command is run, runparts is called and README in
+/etc/cloud/clean.d is not executable which leads to a warning.
+
+No longer deliver the README in our deb package, move content
+to our online docs. Continue to deliver the /etc/cloud/clean.d
+directory as it is used by installers like subiquity.
+
+Fixes: GH-4760
+(cherry picked from commit da08a260965e35fa63def1cd8b8b472f7c354ffe)
+
+There is a downstream only change that is squashed with the upstream commit.
+The spec file under `redhat/` has been updated so as to not include
+`/etc/cloud/clean.d/README` file. Otherwise, we shall see errors like the
+following during the build process:
+
+`error: File not found: /builddir/build/.../etc/cloud/clean.d/README`
+
+After a rebase, we can only maintain the downstream spec file change as
+the rest of it is clean cherry-pick from upstream.
+
+X-downstream-only: true
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+---
+ config/clean.d/README              | 18 ------------------
+ doc/rtd/reference/cli.rst          | 27 +++++++++++++++++++++++++++
+ packages/redhat/cloud-init.spec.in |  1 -
+ packages/suse/cloud-init.spec.in   |  1 -
+ 4 files changed, 27 insertions(+), 20 deletions(-)
+ delete mode 100644 config/clean.d/README
+
+diff --git a/config/clean.d/README b/config/clean.d/README
+deleted file mode 100644
+index 9b0feebe..00000000
+--- a/config/clean.d/README
+++ /dev/null
+@@ -1,18 +0,0 @@
+--- cloud-init's clean.d run-parts directory --
+-
+-This directory is provided for third party applications which need
+-additional configuration artifact cleanup from the filesystem when
+-the command `cloud-init clean` is invoked.
+-
+-The `cloud-init clean` operation is typically performed by image creators
+-when preparing a golden image for clone and redeployment. The clean command
+-removes any cloud-init semaphores, allowing cloud-init to treat the next
+-boot of this image as the "first boot". When the image is next booted
+-cloud-init will performing all initial configuration based on any valid
+-datasource meta-data and user-data.
+-
+-Any executable scripts in this subdirectory will be invoked in lexicographical
+-order with run-parts by the command: sudo cloud-init clean.
+-
+-Typical format of such scripts would be a ##-<some-app> like the following:
+-  /etc/cloud/clean.d/99-live-installer
+diff --git a/doc/rtd/reference/cli.rst b/doc/rtd/reference/cli.rst
+index 04e05c55..c36775a8 100644
+--- a/doc/rtd/reference/cli.rst
+++ b/doc/rtd/reference/cli.rst
+@@ -83,6 +83,33 @@ re-run all stages as it did on first boot.
+   config files for ssh daemon. Argument `network` removes all generated
+   config files for network. `all` removes config files of all types.
+ 
+.. note::
+
+   Cloud-init provides the directory :file:`/etc/cloud/clean.d/` for third party
+   applications which need additional configuration artifact cleanup from
+   the fileystem when the `clean` command is invoked.
+
+   The :command:`clean` operation is typically performed by image creators
+   when preparing a golden image for clone and redeployment. The clean command
+   removes any cloud-init semaphores, allowing cloud-init to treat the next
+   boot of this image as the "first boot". When the image is next booted
+   cloud-init will performing all initial configuration based on any valid
+   datasource meta-data and user-data.
+
+   Any executable scripts in this subdirectory will be invoked in lexicographical
+   order with run-parts when running the :command:`clean` command.
+
+   Typical format of such scripts would be a ##-<some-app> like the following:
+   :file:`/etc/cloud/clean.d/99-live-installer`
+
+   An example of a script is:
+
+   .. code-block:: bash
+
+      sudo rm -rf /var/lib/installer_imgs/
+      sudo rm -rf /var/log/installer/
+
+
+ .. _cli_collect_logs:
+ 
+ :command:`collect-logs`
+diff --git a/packages/redhat/cloud-init.spec.in b/packages/redhat/cloud-init.spec.in
+index 97e95096..accfb1b6 100644
+--- a/packages/redhat/cloud-init.spec.in
+++ b/packages/redhat/cloud-init.spec.in
+@@ -190,7 +190,6 @@ fi
+ # Configs
+ %config(noreplace)      %{_sysconfdir}/cloud/cloud.cfg
+ %dir                    %{_sysconfdir}/cloud/clean.d
+-%config(noreplace)      %{_sysconfdir}/cloud/clean.d/README
+ %dir                    %{_sysconfdir}/cloud/cloud.cfg.d
+ %config(noreplace)      %{_sysconfdir}/cloud/cloud.cfg.d/*.cfg
+ %config(noreplace)      %{_sysconfdir}/cloud/cloud.cfg.d/README
+diff --git a/packages/suse/cloud-init.spec.in b/packages/suse/cloud-init.spec.in
+index 62a9129b..fae3c12b 100644
+--- a/packages/suse/cloud-init.spec.in
+++ b/packages/suse/cloud-init.spec.in
+@@ -115,7 +115,6 @@ version_pys=$(cd "%{buildroot}" && find . -name version.py -type f)
+ 
+ # Configs
+ %dir                    %{_sysconfdir}/cloud/clean.d
+-%config(noreplace)      %{_sysconfdir}/cloud/clean.d/README
+ %config(noreplace) %{_sysconfdir}/cloud/cloud.cfg
+ %dir               %{_sysconfdir}/cloud/cloud.cfg.d
+ %config(noreplace) %{_sysconfdir}/cloud/cloud.cfg.d/*.cfg
+-- 
+2.41.0
+
--- a/SOURCES/ci-net-allow-dhcp6-configuration-from-generate_fallback.patch
+++ b/SOURCES/ci-net-allow-dhcp6-configuration-from-generate_fallback.patch
@ -0,0 +1,182 @@
+From 2942fb776cd1fc765089ebd0004e01dc2b3a5920 Mon Sep 17 00:00:00 2001
+From: Ani Sinha <anisinha@redhat.com>
+Date: Tue, 21 Nov 2023 13:57:15 +0530
+Subject: [PATCH 2/3] net: allow dhcp6 configuration from
+ generate_fallback_configuration()
+
+RH-Author: Ani Sinha <None>
+RH-MergeRequest: 119: net: allow dhcp6 configuration from generate_fallback_configuration()
+RH-Jira: RHEL-7277
+RH-Acked-by: Jon Maloy <jmaloy@redhat.com>
+RH-Acked-by: Cathy Avery <cavery@redhat.com>
+RH-Commit: [2/2] b067c813488dfddc79d8ebd5bb51894ff040c356
+
+This will make sure on Azure we can use both dhcp4 and dhcp6 when IMDS is not
+used. This is useful in situations where only ipv6 network is available and
+there is no dhcp4 running.
+
+This change is mostly a reversal of commit 29ed5f5b646ee and therefore,
+re-application of the commit 518047aea9 with some small changes.
+
+The issue that caused the reversal of 518047aea9 is fixed by the earlier commit:
+cab0eaf290af7 ("net/network_manager: do not set "may-fail" to False for both ipv4 and ipv6 dhcp")
+
+Fixes GH-4439
+
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+(cherry picked from commit 0264e969166846b2f5cf87ccdb051a3a795eca15)
+---
+ cloudinit/net/__init__.py        |  7 ++++++-
+ tests/unittests/net/test_init.py |  4 ++++
+ tests/unittests/test_net.py      | 24 +++++++++++++++++++++---
+ 3 files changed, 31 insertions(+), 4 deletions(-)
+
+diff --git a/cloudinit/net/__init__.py b/cloudinit/net/__init__.py
+index bf21633b..c0888f52 100644
+--- a/cloudinit/net/__init__.py
+++ b/cloudinit/net/__init__.py
+@@ -571,7 +571,12 @@ def generate_fallback_config(config_driver=None):
+         match = {
+             "macaddress": read_sys_net_safe(target_name, "address").lower()
+         }
+-    cfg = {"dhcp4": True, "set-name": target_name, "match": match}
+    cfg = {
+        "dhcp4": True,
+        "dhcp6": True,
+        "set-name": target_name,
+        "match": match,
+    }
+     if config_driver:
+         driver = device_driver(target_name)
+         if driver:
+diff --git a/tests/unittests/net/test_init.py b/tests/unittests/net/test_init.py
+index 561d5151..60a44186 100644
+--- a/tests/unittests/net/test_init.py
+++ b/tests/unittests/net/test_init.py
+@@ -261,6 +261,7 @@ class TestGenerateFallbackConfig(CiTestCase):
+                 "eth1": {
+                     "match": {"macaddress": mac},
+                     "dhcp4": True,
+                    "dhcp6": True,
+                     "set-name": "eth1",
+                 }
+             },
+@@ -278,6 +279,7 @@ class TestGenerateFallbackConfig(CiTestCase):
+                 "eth0": {
+                     "match": {"macaddress": mac},
+                     "dhcp4": True,
+                    "dhcp6": True,
+                     "set-name": "eth0",
+                 }
+             },
+@@ -293,6 +295,7 @@ class TestGenerateFallbackConfig(CiTestCase):
+             "ethernets": {
+                 "eth0": {
+                     "dhcp4": True,
+                    "dhcp6": True,
+                     "match": {"macaddress": mac},
+                     "set-name": "eth0",
+                 }
+@@ -359,6 +362,7 @@ class TestGenerateFallbackConfig(CiTestCase):
+             "ethernets": {
+                 "ens3": {
+                     "dhcp4": True,
+                    "dhcp6": True,
+                     "match": {"name": "ens3"},
+                     "set-name": "ens3",
+                 }
+diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
+index 54d053f3..e52c2497 100644
+--- a/tests/unittests/test_net.py
+++ b/tests/unittests/test_net.py
+@@ -4299,6 +4299,7 @@ class TestGenerateFallbackConfig(CiTestCase):
+             "ethernets": {
+                 "eth0": {
+                     "dhcp4": True,
+                    "dhcp6": True,
+                     "set-name": "eth0",
+                     "match": {
+                         "macaddress": "00:11:22:33:44:55",
+@@ -4383,6 +4384,9 @@ iface lo inet loopback
+ 
+ auto eth0
+ iface eth0 inet dhcp
+
+# control-alias eth0
+iface eth0 inet6 dhcp
+ """
+         self.assertEqual(expected.lstrip(), contents.lstrip())
+ 
+@@ -4472,6 +4476,9 @@ iface lo inet loopback
+ 
+ auto eth1
+ iface eth1 inet dhcp
+
+# control-alias eth1
+iface eth1 inet6 dhcp
+ """
+         self.assertEqual(expected.lstrip(), contents.lstrip())
+ 
+@@ -4695,7 +4702,9 @@ class TestRhelSysConfigRendering(CiTestCase):
+ #
+ BOOTPROTO=dhcp
+ DEVICE=eth1000
+DHCPV6C=yes
+ HWADDR=07-1c-c6-75-a4-be
+IPV6INIT=yes
+ ONBOOT=yes
+ TYPE=Ethernet
+ USERCTL=no
+@@ -5593,7 +5602,8 @@ class TestOpenSuseSysConfigRendering(CiTestCase):
+             expected_content = """
+ # Created by cloud-init automatically, do not edit.
+ #
+-BOOTPROTO=dhcp4
+BOOTPROTO=dhcp
+DHCLIENT6_MODE=managed
+ LLADDR=07-1c-c6-75-a4-be
+ STARTMODE=auto
+ """.lstrip()
+@@ -5979,7 +5989,11 @@ class TestNetworkManagerRendering(CiTestCase):
+ 
+                 [ipv4]
+                 method=auto
+-                may-fail=false
+                may-fail=true
+
+                [ipv6]
+                method=auto
+                may-fail=true
+ 
+                 """
+                 ),
+@@ -6245,6 +6259,9 @@ iface lo inet loopback
+ 
+ auto eth1000
+ iface eth1000 inet dhcp
+
+# control-alias eth1000
+iface eth1000 inet6 dhcp
+ """
+         self.assertEqual(expected.lstrip(), contents.lstrip())
+ 
+@@ -6304,6 +6321,7 @@ class TestNetplanNetRendering:
+                   ethernets:
+                     eth1000:
+                       dhcp4: true
+                      dhcp6: true
+                       match:
+                         macaddress: 07-1c-c6-75-a4-be
+                       set-name: eth1000
+@@ -7803,7 +7821,7 @@ class TestNetworkdNetRendering(CiTestCase):
+             Name=eth1000
+             MACAddress=07-1c-c6-75-a4-be
+             [Network]
+-            DHCP=ipv4"""
+            DHCP=yes"""
+         ).rstrip(" ")
+ 
+         expected = self.create_conf_dict(expected.splitlines())
+-- 
+2.41.0
+
--- a/SOURCES/ci-net-network_manager-do-not-set-may-fail-to-False-for.patch
+++ b/SOURCES/ci-net-network_manager-do-not-set-may-fail-to-False-for.patch
@ -0,0 +1,150 @@
+From 010cd58942c82e902bc02cb5a34074f6083fc890 Mon Sep 17 00:00:00 2001
+From: Ani Sinha <anisinha@redhat.com>
+Date: Thu, 23 Nov 2023 12:27:51 +0530
+Subject: [PATCH 1/3] net/network_manager: do not set "may-fail" to False for
+ both ipv4 and ipv6 dhcp
+
+RH-Author: Ani Sinha <None>
+RH-MergeRequest: 119: net: allow dhcp6 configuration from generate_fallback_configuration()
+RH-Jira: RHEL-7277
+RH-Acked-by: Jon Maloy <jmaloy@redhat.com>
+RH-Acked-by: Cathy Avery <cavery@redhat.com>
+RH-Commit: [1/2] be07418f69a4c461e2fa02a72b7b985053af9660
+
+If "may-fail" is set to False in the Network Manager keyfile for both ipv4
+and ipv6 for dhcp configuration, it essentially means both ipv4 and ipv6 network
+initialization using dhcp must succeed for the overall network configuration to
+succeed. This means, for environments where only ipv4 or ipv6 is available but
+not both and we need to configure both ipv4 and ipv6 dhcp, the overall
+network configuration will fail. This is not what we want. When both ipv4
+and ipv6 dhcp are configured, it is enough for the overall configuration to
+succeed if any one succeeds.
+Therefore, set "may-fail" to True for both ipv4 and ipv6 if and only if both
+ipv4 and ipv6 are configured as dhcp in the Network Manager keyfile and
+"may-fail" is set to False for both. If both ipv4 and ipv6 are configured
+in the keyfile and if for any of them "may-fail" is already set to True,then
+do nothing.
+All other cases remain same as before.
+
+Please see discussions in PR #4474.
+
+Co-authored-by: James Falcon <james.falcon@canonical.com>
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+(cherry picked from commit 29dd5ace73ad60c7452c39b840045fb47fe0711f)
+---
+ cloudinit/net/network_manager.py | 59 ++++++++++++++++++++++++++++++++
+ tests/unittests/test_net.py      |  8 ++---
+ 2 files changed, 63 insertions(+), 4 deletions(-)
+
+diff --git a/cloudinit/net/network_manager.py b/cloudinit/net/network_manager.py
+index 8374cfcc..8a99eb3a 100644
+--- a/cloudinit/net/network_manager.py
+++ b/cloudinit/net/network_manager.py
+@@ -71,6 +71,57 @@ class NMConnection:
+         if not self.config.has_option(section, option):
+             self.config[section][option] = value
+ 
+    def _config_option_is_set(self, section, option):
+        """
+        Checks if a config option is set. Returns True if it is,
+        else returns False.
+        """
+        return self.config.has_section(section) and self.config.has_option(
+            section, option
+        )
+
+    def _get_config_option(self, section, option):
+        """
+        Returns the value of a config option if its set,
+        else returns None.
+        """
+        if self._config_option_is_set(section, option):
+            return self.config[section][option]
+        else:
+            return None
+
+    def _change_set_config_option(self, section, option, value):
+        """
+        Overrides the value of a config option if its already set.
+        Else, if the config option is not set, it does nothing.
+        """
+        if self._config_option_is_set(section, option):
+            self.config[section][option] = value
+
+    def _set_mayfail_true_if_both_false_dhcp(self):
+        """
+        If for both ipv4 and ipv6, 'may-fail' is set to be False,
+        set it to True for both of them.
+        """
+        for family in ["ipv4", "ipv6"]:
+            if self._get_config_option(family, "may-fail") != "false":
+                # if either ipv4 or ipv6 sections are not set/configured,
+                # or if both are configured but for either ipv4 or ipv6,
+                # 'may-fail' is not 'false', do not do anything.
+                return
+            if self._get_config_option(family, "method") not in [
+                "dhcp",
+                "auto",
+            ]:
+                # if both v4 and v6 are not dhcp, do not do anything.
+                return
+
+        # If we landed here, it means both ipv4 and ipv6 are configured
+        # with dhcp/auto and both have 'may-fail' set to 'false'. So set
+        # both to 'true'.
+        for family in ["ipv4", "ipv6"]:
+            self._change_set_config_option(family, "may-fail", "true")
+
+     def _set_ip_method(self, family, subnet_type):
+         """
+         Ensures there's appropriate [ipv4]/[ipv6] for given family
+@@ -271,6 +322,14 @@ class NMConnection:
+             if family == "ipv4" and "mtu" in subnet:
+                 ipv4_mtu = subnet["mtu"]
+ 
+        # we do not want to set may-fail to false for both ipv4 and ipv6 dhcp
+        # at the at the same time. This will make the network configuration
+        # work only when both ipv4 and ipv6 dhcp succeeds. This may not be
+        # what we want. If we have configured both ipv4 and ipv6 dhcp, any one
+        # succeeding should be enough. Therefore, if "may-fail" is set to
+        # False for both ipv4 and ipv6 dhcp, set them both to True.
+        self._set_mayfail_true_if_both_false_dhcp()
+
+         if ipv4_mtu is None:
+             ipv4_mtu = device_mtu
+         if not ipv4_mtu == device_mtu:
+diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
+index 052b0674..54d053f3 100644
+--- a/tests/unittests/test_net.py
+++ b/tests/unittests/test_net.py
+@@ -1470,11 +1470,11 @@ NETWORK_CONFIGS = {
+ 
+                 [ipv4]
+                 method=auto
+-                may-fail=false
+                may-fail=true
+ 
+                 [ipv6]
+                 method=auto
+-                may-fail=false
+                may-fail=true
+ 
+                 """
+             ),
+@@ -1642,11 +1642,11 @@ NETWORK_CONFIGS = {
+ 
+                 [ipv6]
+                 method=auto
+-                may-fail=false
+                may-fail=true
+ 
+                 [ipv4]
+                 method=auto
+-                may-fail=false
+                may-fail=true
+ 
+                 """
+             ),
+-- 
+2.41.0
+
--- a/SOURCES/ci-net-nm-check-for-presence-of-ifcfg-files-when-nm-con.patch
+++ b/SOURCES/ci-net-nm-check-for-presence-of-ifcfg-files-when-nm-con.patch
@ -0,0 +1,123 @@
+From ffc8f3fbb4c8c14a4ef2b6a99a9ea61da4bedde7 Mon Sep 17 00:00:00 2001
+From: Ani Sinha <anisinha@redhat.com>
+Date: Thu, 7 Dec 2023 02:39:51 +0530
+Subject: [PATCH 3/3] net/nm: check for presence of ifcfg files when nm
+ connection files are absent (#4645)
+
+RH-Author: Ani Sinha <None>
+RH-MergeRequest: 120: net/nm: check for presence of ifcfg files when nm connection files are absent (#4645)
+RH-Jira: RHEL-17610
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Acked-by: Jon Maloy <jmaloy@redhat.com>
+RH-Commit: [1/1] e0647418de8b70724a32500f26f544650d701404
+
+On systems that use network manager to manage connections and activate network
+interfaces, they may also use ifcfg files for configuring
+interfaces using ifcfg-rh network manager plugin. When network manager is used
+as the activator, we need to also check for the presence of ifcfg interface
+config file when the network manager connection file is absent and if ifcfg-rh
+plugin is present.
+Hence, with this change, network manager activator first tries to use network
+manager connection files to bring up or bring down the interface. If the
+connection files are not present and if ifcfg-rh plugin is present, it tries to
+use ifcfg files for the interface. If the plugin or the ifcfg files are not
+present, the activator fails to activate or deactivate the interface and it
+bails out with warning log.
+
+Fixes: GH-4640
+
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+(cherry picked from commit d1d5166895da471cff3606c70d4e8ab6eec1c006)
+---
+ cloudinit/net/activators.py      |  7 +++++++
+ cloudinit/net/network_manager.py | 33 ++++++++++++++++++++++++++++++--
+ 2 files changed, 38 insertions(+), 2 deletions(-)
+
+diff --git a/cloudinit/net/activators.py b/cloudinit/net/activators.py
+index e69da40d..dd858862 100644
+--- a/cloudinit/net/activators.py
+++ b/cloudinit/net/activators.py
+@@ -117,6 +117,13 @@ class NetworkManagerActivator(NetworkActivator):
+         from cloudinit.net.network_manager import conn_filename
+ 
+         filename = conn_filename(device_name)
+        if filename is None:
+            LOG.warning(
+                "Unable to find an interface config file. "
+                "Unable to bring up interface."
+            )
+            return False
+
+         cmd = ["nmcli", "connection", "load", filename]
+         if _alter_interface(cmd, device_name):
+             cmd = ["nmcli", "connection", "up", "filename", filename]
+diff --git a/cloudinit/net/network_manager.py b/cloudinit/net/network_manager.py
+index 8a99eb3a..76a0ac15 100644
+--- a/cloudinit/net/network_manager.py
+++ b/cloudinit/net/network_manager.py
+@@ -17,10 +17,12 @@ from typing import Optional
+ from cloudinit import subp, util
+ from cloudinit.net import is_ipv6_address, renderer, subnet_is_ipv6
+ from cloudinit.net.network_state import NetworkState
+from cloudinit.net.sysconfig import available_nm_ifcfg_rh
+ 
+ NM_RUN_DIR = "/etc/NetworkManager"
+ NM_LIB_DIR = "/usr/lib/NetworkManager"
+ NM_CFG_FILE = "/etc/NetworkManager/NetworkManager.conf"
+IFCFG_CFG_FILE = "/etc/sysconfig/network-scripts"
+ NM_IPV6_ADDR_GEN_CONF = """# This is generated by cloud-init. Do not edit.
+ #
+ [.config]
+@@ -442,7 +444,7 @@ class Renderer(renderer.Renderer):
+         for con_id, conn in self.connections.items():
+             if not conn.valid():
+                 continue
+-            name = conn_filename(con_id, target)
+            name = nm_conn_filename(con_id, target)
+             util.write_file(name, conn.dump(), 0o600)
+ 
+         # Select EUI64 to be used by default by NM for creating the address
+@@ -452,12 +454,39 @@ class Renderer(renderer.Renderer):
+         )
+ 
+ 
+-def conn_filename(con_id, target=None):
+def nm_conn_filename(con_id, target=None):
+     target_con_dir = subp.target_path(target, NM_RUN_DIR)
+     con_file = f"cloud-init-{con_id}.nmconnection"
+     return f"{target_con_dir}/system-connections/{con_file}"
+ 
+ 
+def sysconfig_conn_filename(devname, target=None):
+    target_con_dir = subp.target_path(target, IFCFG_CFG_FILE)
+    con_file = f"ifcfg-{devname}"
+    return f"{target_con_dir}/{con_file}"
+
+
+def conn_filename(devname):
+    """
+    This function returns the name of the interface config file.
+    It first checks for presence of network manager connection file.
+    If absent and ifcfg-rh plugin for network manager is available,
+    it returns the name of the ifcfg file if it is present. If the
+    plugin is not present or the plugin is present but ifcfg file is
+    not, it returns None.
+    This function is called from NetworkManagerActivator class in
+    activators.py.
+    """
+    conn_file = nm_conn_filename(devname)
+    # If the network manager connection file is absent, also check for
+    # presence of ifcfg files for the same interface (if nm-ifcfg-rh plugin is
+    # present, network manager can handle ifcfg files). If both network manager
+    # connection file and ifcfg files are absent, return None.
+    if not os.path.isfile(conn_file) and available_nm_ifcfg_rh():
+        conn_file = sysconfig_conn_filename(devname)
+    return conn_file if os.path.isfile(conn_file) else None
+
+
+ def cloud_init_nm_conf_filename(target=None):
+     target_con_dir = subp.target_path(target, NM_RUN_DIR)
+     conf_file = "30-cloud-init-ip6-addr-gen-mode.conf"
+-- 
+2.41.0
+
--- a/SOURCES/ci-setup.py-adjust-udev-rules-default-path-1513.patch
+++ b/SOURCES/ci-setup.py-adjust-udev-rules-default-path-1513.patch
@ -1,57 +0,0 @@
-From f771d841dbdef8fbb1c1a3d1b8d51ff101354502 Mon Sep 17 00:00:00 2001
-From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-Date: Fri, 17 Jun 2022 09:41:23 +0200
-Subject: [PATCH 3/3] setup.py: adjust udev/rules default path (#1513)
-
-RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-RH-MergeRequest: 30: setup.py: adjust udev/rules default path (#1513)
-RH-Commit: [2/2] b71362acefa15587b2c72e8981708065d2fcfa07 (eesposit/cloud-init-centos-)
-RH-Bugzilla: 2096270
-RH-Acked-by: Mohamed Gamal Morsy <mmorsy@redhat.com>
-RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
-
-commit 70715125f3af118ae242770e61064c24f41e9a02
-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-Date:   Thu Jun 16 20:39:42 2022 +0200
-
-    setup.py: adjust udev/rules default path (#1513)
-
-    RHEL must put cloudinit .rules files in /usr/lib/udev/rules.d
-    This place is a rhel standard and since it is used by all packages
-    cannot be modified.
-
-    Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-
-Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
---
- setup.py | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index a9132d2c..fdf27cd7 100755
--- a/setup.py
-+++ b/setup.py
-@@ -302,6 +302,11 @@ data_files = [
-     ),
- ]
- if not platform.system().endswith("BSD"):
-+
-+    RULES_PATH = LIB
-+    if os.path.isfile("/etc/redhat-release"):
-+        RULES_PATH = "/usr/lib"
-+
-     data_files.extend(
-         [
-             (
-@@ -309,7 +314,7 @@ if not platform.system().endswith("BSD"):
-                 ["tools/hook-network-manager"],
-             ),
-             (ETC + "/dhcp/dhclient-exit-hooks.d/", ["tools/hook-dhclient"]),
-            (LIB + "/udev/rules.d", [f for f in glob("udev/*.rules")]),
-+            (RULES_PATH + "/udev/rules.d", [f for f in glob("udev/*.rules")]),
-             (
-                 ETC + "/systemd/system/sshd-keygen@.service.d/",
-                 ["systemd/disable-sshd-keygen-if-cloud-init-active.conf"],
-- 
-2.35.1
-
--- a/SOURCES/ci-test-jsonschema-Pin-jsonschema-version-4781.patch
+++ b/SOURCES/ci-test-jsonschema-Pin-jsonschema-version-4781.patch
@ -0,0 +1,48 @@
+From c43791eeb00bc9000abff0125c18aa6a7e8b7160 Mon Sep 17 00:00:00 2001
+From: Brett Holman <brett.holman@canonical.com>
+Date: Tue, 16 Jan 2024 12:43:17 -0700
+Subject: [PATCH 2/2] test(jsonschema): Pin jsonschema version (#4781)
+
+RH-Author: Ani Sinha <None>
+RH-MergeRequest: 121: fix(clean): stop warning when running clean command (#4761)
+RH-Jira: RHEL-21530
+RH-Acked-by: Cathy Avery <cavery@redhat.com>
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Commit: [2/2] f864085d47723b3fb462c3b6fc6e24b90bf040aa
+
+Release 4.21.0 broke tests
+
+(cherry picked from commit 034a5cdf10582da0492321f861b2b8b42182a54e)
+---
+ requirements.txt      | 2 +-
+ test-requirements.txt | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/requirements.txt b/requirements.txt
+index edec46a7..a095de18 100644
+--- a/requirements.txt
+++ b/requirements.txt
+@@ -28,7 +28,7 @@ requests
+ jsonpatch
+ 
+ # For validating cloud-config sections per schema definitions
+-jsonschema
+jsonschema<=4.20.0
+ 
+ # Used by DataSourceVMware to inspect the host's network configuration during
+ # the "setup()" function.
+diff --git a/test-requirements.txt b/test-requirements.txt
+index 19488b94..46a98b4c 100644
+--- a/test-requirements.txt
+++ b/test-requirements.txt
+@@ -9,6 +9,6 @@ pytest!=7.3.2
+ pytest-cov
+ pytest-mock
+ setuptools
+-jsonschema
+jsonschema<=4.20.0
+ responses
+ passlib
+-- 
+2.41.0
+
--- a/SPECS/cloud-init.spec
+++ b/SPECS/cloud-init.spec