Fix and Improve AlmaLinux support

.cloud-init.metadata

@@ -1 +1 @@
-e73116733f5636eb4bc1a5e47e802c3635b9bfa2 SOURCES/23.4.tar.gz
+830185bb5ce87ad86e4d1c0c62329bb255ec1648 SOURCES/cloud-init-22.1.tar.gz

.gitignore

@@ -1 +1 @@
-SOURCES/23.4.tar.gz
+SOURCES/cloud-init-22.1.tar.gz

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

@@ -0,0 +1,586 @@
+From 5e1e568d7085fd4443b4e3ccc492f5e31747e270 Mon Sep 17 00:00:00 2001
+From: Amy Chen <xiachen@redhat.com>
+Date: Wed, 20 Apr 2022 10:59:48 +0800
+Subject: Add initial redhat setup
+
+Merged patches (22.1)
+- d18029bf Add netifaces package as a Requires in cloud-init.spec.template
+- 31adf961 Add gdisk and openssl as deps to fix UEFI / Azure initialization
+- f4a2905d Add dhcp-client as a dependency
+- 290e14cc cloud-init.spec.template: update %systemd_postun parameter
+- 9be4ae9b (tag: cloud-init-21.1-1.el8) Update to cloud-init-21.1-1.el8
+
+Conflicts:
+cloudinit/config/cc_chef.py  Using double quotes instead of single quotes
+
+cloudinit/settings.py
+- Using rhel settings
+- Using double quotes instead of single quotes
+
+setup.py
+- Following the changes of 21.1 rebase
+- Using double quotes instead of single quotes
+
+redhat/cloud-init.spec.template
+- Add the drop-in to the right cloud-init.spec used by our package builder, which is downstream-only part of the bz 2002492 fix.
+
+redhat/Makefile.common
+- Backport the build handling fixes from patch "Update to cloud-init-21.1-1.el8"
+
+Signed-off-by: Amy Chen <xiachen@redhat.com>
+
+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>
+---
+ .gitignore                            |   1 +
+ cloudinit/config/cc_chef.py           |  65 ++-
+ cloudinit/settings.py                 |   7 +-
+ redhat/.gitignore                     |   1 +
+ redhat/Makefile                       |  71 +++
+ redhat/Makefile.common                |  37 ++
+ redhat/cloud-init-tmpfiles.conf       |   1 +
+ redhat/cloud-init.spec.template       | 696 ++++++++++++++++++++++++++
+ redhat/gating.yaml                    |   8 +
+ redhat/rpmbuild/BUILD/.gitignore      |   3 +
+ redhat/rpmbuild/RPMS/.gitignore       |   3 +
+ redhat/rpmbuild/SOURCES/.gitignore    |   3 +
+ redhat/rpmbuild/SPECS/.gitignore      |   3 +
+ redhat/rpmbuild/SRPMS/.gitignore      |   3 +
+ redhat/scripts/frh.py                 |  25 +
+ redhat/scripts/git-backport-diff      | 327 ++++++++++++
+ redhat/scripts/git-compile-check      | 215 ++++++++
+ redhat/scripts/process-patches.sh     |  92 ++++
+ redhat/scripts/tarball_checksum.sh    |   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       |  25 +
+ rhel/systemd/cloud-init.target        |   7 +
+ setup.py                              |  28 +-
+ tools/read-version                    |  28 +-
+ 30 files changed, 1756 insertions(+), 55 deletions(-)
+ create mode 100644 redhat/.gitignore
+ create mode 100644 redhat/Makefile
+ create mode 100644 redhat/Makefile.common
+ create mode 100644 redhat/cloud-init-tmpfiles.conf
+ create mode 100644 redhat/cloud-init.spec.template
+ create mode 100644 redhat/gating.yaml
+ create mode 100644 redhat/rpmbuild/BUILD/.gitignore
+ create mode 100644 redhat/rpmbuild/RPMS/.gitignore
+ create mode 100644 redhat/rpmbuild/SOURCES/.gitignore
+ create mode 100644 redhat/rpmbuild/SPECS/.gitignore
+ create mode 100644 redhat/rpmbuild/SRPMS/.gitignore
+ create mode 100755 redhat/scripts/frh.py
+ create mode 100755 redhat/scripts/git-backport-diff
+ create mode 100755 redhat/scripts/git-compile-check
+ create mode 100755 redhat/scripts/process-patches.sh
+ create mode 100755 redhat/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..39650a5b 100644
+--- a/cloudinit/settings.py
++++ b/cloudinit/settings.py
+@@ -50,13 +50,16 @@ CFG_BUILTIN = {
+     ],
+     "def_log_file": "/var/log/cloud-init.log",
+     "log_cfgs": [],
+-    "syslog_fix_perms": ["syslog:adm", "root:adm", "root:wheel", "root:root"],
++    "mount_default_fields": [None, None, "auto", "defaults,nofail", "0", "2"],
++    "ssh_deletekeys": False,
++    "ssh_genkeytypes": [],
++    "syslog_fix_perms": [],
+     "system_info": {
+         "paths": {
+             "cloud_dir": "/var/lib/cloud",
+             "templates_dir": "/etc/cloud/templates/",
+         },
+-        "distro": "ubuntu",
++        "distro": "rhel",
+         "network": {"renderers": None},
+     },
+     "vendor_data": {"enabled": True, "prefix": []},
+diff --git a/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..82e8bf62
+--- /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:   0
++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..d0023a05
+--- /dev/null
++++ b/rhel/systemd/cloud-init.service
+@@ -0,0 +1,25 @@
++[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
++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
+

SOURCES/0001-Fix-and-Improve-AlmaLinux-support.patch

@@ -0,0 +1,539 @@
+From 93aff1ae285938ed98d77bb8dfadbbc6f5d94dff Mon Sep 17 00:00:00 2001
+From: Elkhan Mammadli <elkhan.mammadli@protonmail.com>
+Date: Tue, 21 Feb 2023 15:20:57 +0400
+Subject: [PATCH] Fix and Improve AlmaLinux support
+
+Add a new patch to fix some module errors and improve AlmaLinux support
+
+- Fix cc_ntp module
+- Add support for cc_yum_add_repo module
+- Add support for cc_ca_certs module
+- Improve the AlmaLinux support in Cloud-init configuration
+- Improve the AlmaLinux support in Cloud-init systemd services
+- Add support to Rbx Cloud Datasource
+
+Signed-off-by: Elkhan Mammadli <elkhan.mammadli@protonmail.com>
+---
+ cloudinit/config/cc_ca_certs.py         |  9 +++-
+ cloudinit/config/cc_ntp.py              |  8 ++++
+ cloudinit/settings.py                   |  2 +-
+ cloudinit/sources/DataSourceRbxCloud.py |  2 +-
+ config/cloud.cfg.tmpl                   | 10 ++--
+ packages/pkg-deps.json                  | 14 ++++++
+ systemd/cloud-config.service.tmpl       |  2 +-
+ systemd/cloud-final.service.tmpl        |  4 +-
+ systemd/cloud-init-local.service.tmpl   | 12 ++---
+ systemd/cloud-init.service.tmpl         |  4 +-
+ templates/chrony.conf.almalinux.tmpl    | 45 ++++++++++++++++++
+ templates/ntp.conf.almalinux.tmpl       | 61 +++++++++++++++++++++++++
+ tests/unittests/test_net.py             |  1 +
+ tests/unittests/test_render_cloudcfg.py |  2 +
+ tools/read-dependencies                 |  8 +++-
+ tools/run-container                     | 12 ++---
+ 16 files changed, 169 insertions(+), 27 deletions(-)
+ create mode 100644 templates/chrony.conf.almalinux.tmpl
+ create mode 100644 templates/ntp.conf.almalinux.tmpl
+
+diff --git a/cloudinit/config/cc_ca_certs.py b/cloudinit/config/cc_ca_certs.py
+index 6084cb4..55746ea 100644
+--- a/cloudinit/config/cc_ca_certs.py
++++ b/cloudinit/config/cc_ca_certs.py
+@@ -19,6 +19,13 @@ DEFAULT_CONFIG = {
+     "ca_cert_update_cmd": ["update-ca-certificates"],
+ }
+ DISTRO_OVERRIDES = {
++    "almalinux": {
++        "ca_cert_path": "/usr/share/pki/ca-trust-source/",
++        "ca_cert_filename": "anchors/cloud-init-ca-certs.crt",
++        "ca_cert_config": None,
++        "ca_cert_system_path": "/etc/pki/ca-trust/",
++        "ca_cert_update_cmd": ["update-ca-trust"],
++    },
+     "rhel": {
+         "ca_cert_path": "/usr/share/pki/ca-trust-source/",
+         "ca_cert_filename": "anchors/cloud-init-ca-certs.crt",
+@@ -43,7 +50,7 @@ can be removed from the system with the configuration option
+     ca-certificates package is installed but not if the
+     ca-certificates-bundle package is installed.
+ """
+-distros = ["alpine", "debian", "ubuntu", "rhel"]
++distros = ["almalinux", "alpine", "debian", "ubuntu", "rhel"]
+ 
+ meta: MetaSchema = {
+     "id": "cc_ca_certs",
+diff --git a/cloudinit/config/cc_ntp.py b/cloudinit/config/cc_ntp.py
+index 25bba76..a0c29c4 100644
+--- a/cloudinit/config/cc_ntp.py
++++ b/cloudinit/config/cc_ntp.py
+@@ -80,6 +80,14 @@ NTP_CLIENT_CONFIG = {
+ 
+ # This is Distro-specific configuration overrides of the base config
+ DISTRO_CLIENT_CONFIG = {
++    "almalinux": {
++        "ntp": {
++            "service_name": "ntpd",
++        },
++        "chrony": {
++            "service_name": "chronyd",
++        },
++    },
+     "alpine": {
+         "chrony": {
+             "confpath": "/etc/chrony/chrony.conf",
+diff --git a/cloudinit/settings.py b/cloudinit/settings.py
+index 71672e1..e8224f8 100644
+--- a/cloudinit/settings.py
++++ b/cloudinit/settings.py
+@@ -58,7 +58,7 @@ CFG_BUILTIN = {
+             "cloud_dir": "/var/lib/cloud",
+             "templates_dir": "/etc/cloud/templates/",
+         },
+-        "distro": "rhel",
++        "distro": "almalinux",
+         "network": {"renderers": None},
+     },
+     "vendor_data": {"enabled": True, "prefix": []},
+diff --git a/cloudinit/sources/DataSourceRbxCloud.py b/cloudinit/sources/DataSourceRbxCloud.py
+index 14ac77e..7cd14a1 100644
+--- a/cloudinit/sources/DataSourceRbxCloud.py
++++ b/cloudinit/sources/DataSourceRbxCloud.py
+@@ -55,7 +55,7 @@ def _sub_arp(cmd):
+ 
+ def gratuitous_arp(items, distro):
+     source_param = "-S"
+-    if distro.name in ["fedora", "centos", "rhel"]:
++    if distro.name in ["almalinux", "fedora", "centos", "rhel"]:
+         source_param = "-s"
+     for item in items:
+         try:
+diff --git a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl
+index 80ab4f9..ce63c1b 100644
+--- a/config/cloud.cfg.tmpl
++++ b/config/cloud.cfg.tmpl
+@@ -34,7 +34,7 @@ disable_root: true
+ 
+ {% if variant in ["almalinux", "alpine", "amazon", "centos", "cloudlinux", "eurolinux",
+                   "fedora", "miraclelinux", "openEuler", "rhel", "rocky", "virtuozzo"] %}
+-{% if variant == "rhel" %}
++{% if variant in ["almalinux", "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']
+@@ -70,7 +70,7 @@ network:
+   config: disabled
+ {% endif %}
+ 
+-{% if variant == "rhel" %}
++{% if variant in ["almalinux", "rhel"] %}
+ # Default redhat settings:
+ ssh_deletekeys:   true
+ ssh_genkeytypes:  ['rsa', 'ecdsa', 'ed25519']
+@@ -119,7 +119,7 @@ cloud_config_modules:
+ {% endif %}
+ {% if variant not in ["photon"] %}
+  - ssh-import-id
+-{% if variant not in ["rhel"] %}
++{% if variant not in ["almalinux", "rhel"] %}
+  - keyboard
+ {% endif %}
+  - locale
+@@ -128,7 +128,7 @@ cloud_config_modules:
+ {% if variant in ["rhel"] %}
+  - rh_subscription
+ {% endif %}
+-{% if variant in ["rhel", "fedora", "photon"] %}
++{% if variant in ["almalinux", "rhel", "fedora", "photon"] %}
+ {% if variant not in ["photon"] %}
+  - spacewalk
+ {% endif %}
+@@ -275,7 +275,7 @@ system_info:
+      groups: [adm, sudo]
+ {% elif variant == "arch" %}
+      groups: [wheel, users]
+-{% elif variant == "rhel" %}
++{% elif variant in ["almalinux", "rhel"] %}
+      groups: [adm, systemd-journal]
+ {% else %}
+      groups: [wheel, adm, systemd-journal]
+diff --git a/packages/pkg-deps.json b/packages/pkg-deps.json
+index eaf1346..0aa70f6 100644
+--- a/packages/pkg-deps.json
++++ b/packages/pkg-deps.json
+@@ -1,4 +1,18 @@
+ {
++   "almalinux" : {
++      "build-requires" : [
++         "python3-devel"
++      ],
++      "requires" : [
++         "e2fsprogs",
++         "iproute",
++         "net-tools",
++         "procps",
++         "rsyslog",
++         "shadow-utils",
++         "sudo"
++      ]
++   },
+    "debian" : {
+       "build-requires" : [
+          "debhelper",
+diff --git a/systemd/cloud-config.service.tmpl b/systemd/cloud-config.service.tmpl
+index d5568a6..4b88f83 100644
+--- a/systemd/cloud-config.service.tmpl
++++ b/systemd/cloud-config.service.tmpl
+@@ -4,7 +4,7 @@ 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" %}
++{% if variant in ["almalinux", "rhel"] %}
+ ConditionPathExists=!/etc/cloud/cloud-init.disabled
+ ConditionKernelCommandLine=!cloud-init=disabled
+ {% endif %}
+diff --git a/systemd/cloud-final.service.tmpl b/systemd/cloud-final.service.tmpl
+index 85f423a..aa5990c 100644
+--- a/systemd/cloud-final.service.tmpl
++++ b/systemd/cloud-final.service.tmpl
+@@ -7,7 +7,7 @@ After=multi-user.target
+ Before=apt-daily.service
+ {% endif %}
+ Wants=network-online.target cloud-config.service
+-{% if variant == "rhel" %}
++{% if variant in ["almalinux", "rhel"] %}
+ ConditionPathExists=!/etc/cloud/cloud-init.disabled
+ ConditionKernelCommandLine=!cloud-init=disabled
+ {% endif %}
+@@ -19,7 +19,7 @@ ExecStart=/usr/bin/cloud-init modules --mode=final
+ RemainAfterExit=yes
+ TimeoutSec=0
+ KillMode=process
+-{% if variant == "rhel" %}
++{% if variant in ["almalinux", "rhel"] %}
+ # Restart NetworkManager if it is present and running.
+ ExecStartPost=/bin/sh -c 'u=NetworkManager.service; \
+  out=$(systemctl show --property=SubState $u) || exit; \
+diff --git a/systemd/cloud-init-local.service.tmpl b/systemd/cloud-init-local.service.tmpl
+index a6b8265..29ac717 100644
+--- a/systemd/cloud-init-local.service.tmpl
++++ b/systemd/cloud-init-local.service.tmpl
+@@ -1,23 +1,23 @@
+ ## template:jinja
+ [Unit]
+ Description=Initial cloud-init job (pre-networking)
+-{% if variant in ["ubuntu", "unknown", "debian", "rhel" ] %}
++{% if variant in ["almalinux", "ubuntu", "unknown", "debian", "rhel" ] %}
+ DefaultDependencies=no
+ {% endif %}
+ Wants=network-pre.target
+ After=hv_kvp_daemon.service
+ After=systemd-remount-fs.service
+-{% if variant == "rhel" %}
++{% if variant in ["almalinux", "rhel"] %}
+ Requires=dbus.socket
+ After=dbus.socket
+ {% endif %}
+ Before=NetworkManager.service
+-{% if variant == "rhel" %}
++{% if variant in ["almalinux", "rhel"] %}
+ Before=network.service
+ {% endif %}
+ Before=network-pre.target
+ Before=shutdown.target
+-{% if variant == "rhel" %}
++{% if variant in ["almalinux", "rhel"] %}
+ Before=firewalld.target
+ Conflicts=shutdown.target
+ {% endif %}
+@@ -26,14 +26,14 @@ Before=sysinit.target
+ Conflicts=shutdown.target
+ {% endif %}
+ RequiresMountsFor=/var/lib/cloud
+-{% if variant == "rhel" %}
++{% if variant in ["almalinux", "rhel"] %}
+ ConditionPathExists=!/etc/cloud/cloud-init.disabled
+ ConditionKernelCommandLine=!cloud-init=disabled
+ {% endif %}
+ 
+ [Service]
+ Type=oneshot
+-{% if variant == "rhel" %}
++{% if variant in ["almalinux", "rhel"] %}
+ ExecStartPre=/bin/mkdir -p /run/cloud-init
+ ExecStartPre=/sbin/restorecon /run/cloud-init
+ ExecStartPre=/usr/bin/touch /run/cloud-init/enabled
+diff --git a/systemd/cloud-init.service.tmpl b/systemd/cloud-init.service.tmpl
+index fc984d5..92dd985 100644
+--- a/systemd/cloud-init.service.tmpl
++++ b/systemd/cloud-init.service.tmpl
+@@ -1,7 +1,7 @@
+ ## template:jinja
+ [Unit]
+ Description=Initial cloud-init job (metadata service crawler)
+-{% if variant not in ["photon", "rhel"] %}
++{% if variant not in ["almalinux", "photon", "rhel"] %}
+ DefaultDependencies=no
+ {% endif %}
+ Wants=cloud-init-local.service
+@@ -37,7 +37,7 @@ Before=shutdown.target
+ Conflicts=shutdown.target
+ {% endif %}
+ Before=systemd-user-sessions.service
+-{% if variant == "rhel" %}
++{% if variant in ["almalinux", "rhel"] %}
+ ConditionPathExists=!/etc/cloud/cloud-init.disabled
+ ConditionKernelCommandLine=!cloud-init=disabled
+ {% endif %}
+diff --git a/templates/chrony.conf.almalinux.tmpl b/templates/chrony.conf.almalinux.tmpl
+new file mode 100644
+index 0000000..5b3542e
+--- /dev/null
++++ b/templates/chrony.conf.almalinux.tmpl
+@@ -0,0 +1,45 @@
++## template:jinja
++# Use public servers from the pool.ntp.org project.
++# Please consider joining the pool (http://www.pool.ntp.org/join.html).
++{% if pools %}# pools
++{% endif %}
++{% for pool in pools -%}
++pool {{pool}} iburst
++{% endfor %}
++{%- if servers %}# servers
++{% endif %}
++{% for server in servers -%}
++server {{server}} iburst
++{% endfor %}
++
++# Record the rate at which the system clock gains/losses time.
++driftfile /var/lib/chrony/drift
++
++# Allow the system clock to be stepped in the first three updates
++# if its offset is larger than 1 second.
++makestep 1.0 3
++
++# Enable kernel synchronization of the real-time clock (RTC).
++rtcsync
++
++# Enable hardware timestamping on all interfaces that support it.
++#hwtimestamp *
++
++# Increase the minimum number of selectable sources required to adjust
++# the system clock.
++#minsources 2
++
++# Allow NTP client access from local network.
++#allow 192.168.0.0/16
++
++# Serve time even if not synchronized to a time source.
++#local stratum 10
++
++# Specify file containing keys for NTP authentication.
++#keyfile /etc/chrony.keys
++
++# Specify directory for log files.
++logdir /var/log/chrony
++
++# Select which information is logged.
++#log measurements statistics tracking
+diff --git a/templates/ntp.conf.almalinux.tmpl b/templates/ntp.conf.almalinux.tmpl
+new file mode 100644
+index 0000000..62b4776
+--- /dev/null
++++ b/templates/ntp.conf.almalinux.tmpl
+@@ -0,0 +1,61 @@
++## template:jinja
++
++# For more information about this file, see the man pages
++# ntp.conf(5), ntp_acc(5), ntp_auth(5), ntp_clock(5), ntp_misc(5), ntp_mon(5).
++
++driftfile /var/lib/ntp/drift
++
++# Permit time synchronization with our time source, but do not
++# permit the source to query or modify the service on this system.
++restrict default kod nomodify notrap nopeer noquery
++restrict -6 default kod nomodify notrap nopeer noquery
++
++# Permit all access over the loopback interface.  This could
++# be tightened as well, but to do so would effect some of
++# the administrative functions.
++restrict 127.0.0.1 
++restrict -6 ::1
++
++# Hosts on local network are less restricted.
++#restrict 192.168.1.0 mask 255.255.255.0 nomodify notrap
++
++# Use public servers from the pool.ntp.org project.
++# Please consider joining the pool (http://www.pool.ntp.org/join.html).
++{% if pools %}# pools
++{% endif %}
++{% for pool in pools -%}
++pool {{pool}} iburst
++{% endfor %}
++{%- if servers %}# servers
++{% endif %}
++{% for server in servers -%}
++server {{server}} iburst
++{% endfor %}
++
++#broadcast 192.168.1.255 autokey	# broadcast server
++#broadcastclient			# broadcast client
++#broadcast 224.0.1.1 autokey		# multicast server
++#multicastclient 224.0.1.1		# multicast client
++#manycastserver 239.255.254.254		# manycast server
++#manycastclient 239.255.254.254 autokey # manycast client
++
++# Enable public key cryptography.
++#crypto
++
++includefile /etc/ntp/crypto/pw
++
++# Key file containing the keys and key identifiers used when operating
++# with symmetric key cryptography. 
++keys /etc/ntp/keys
++
++# Specify the key identifiers which are trusted.
++#trustedkey 4 8 42
++
++# Specify the key identifier to use with the ntpdc utility.
++#requestkey 8
++
++# Specify the key identifier to use with the ntpq utility.
++#controlkey 8
++
++# Enable writing of statistics records.
++#statistics clockstats cryptostats loopstats peerstats
+diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
+index 591241b..05aa3f9 100644
+--- a/tests/unittests/test_net.py
++++ b/tests/unittests/test_net.py
+@@ -6254,6 +6254,7 @@ class TestNetRenderers(CiTestCase):
+     def test_sysconfig_available_uses_variant_mapping(self, m_info, m_avail):
+         m_avail.return_value = True
+         variants = [
++            "almalinux",
+             "suse",
+             "centos",
+             "eurolinux",
+diff --git a/tests/unittests/test_render_cloudcfg.py b/tests/unittests/test_render_cloudcfg.py
+index 9f95d44..f1844e9 100644
+--- a/tests/unittests/test_render_cloudcfg.py
++++ b/tests/unittests/test_render_cloudcfg.py
+@@ -9,6 +9,7 @@ from tests.unittests.helpers import cloud_init_project_dir
+ 
+ # TODO(Look to align with tools.render-cloudcfg or cloudinit.distos.OSFAMILIES)
+ DISTRO_VARIANTS = [
++    "almalinux",
+     "amazon",
+     "arch",
+     "centos",
+@@ -66,6 +67,7 @@ class TestRenderCloudCfg:
+             system_cfg = util.load_yaml(stream.read())
+ 
+         default_user_exceptions = {
++            "almalinux": "almalinux",
+             "amazon": "ec2-user",
+             "debian": "ubuntu",
+             "rhel": "cloud-user",
+diff --git a/tools/read-dependencies b/tools/read-dependencies
+index efa5879..7888c8f 100755
+--- a/tools/read-dependencies
++++ b/tools/read-dependencies
+@@ -22,6 +22,7 @@ DEFAULT_REQUIREMENTS = 'requirements.txt'
+ 
+ # Map the appropriate package dir needed for each distro choice
+ DISTRO_PKG_TYPE_MAP = {
++    'almalinux': 'redhat',
+     'centos': 'redhat',
+     'eurolinux': 'redhat',
+     'miraclelinux': 'redhat',
+@@ -68,6 +69,7 @@ ZYPPER_INSTALL = [
+     '--auto-agree-with-licenses']
+ 
+ DRY_DISTRO_INSTALL_PKG_CMD = {
++    'almalinux': ['yum', 'install', '--assumeyes'],
+     'rocky': ['yum', 'install', '--assumeyes'],
+     'centos': ['yum', 'install', '--assumeyes'],
+     'eurolinux': ['yum', 'install', '--assumeyes'],
+@@ -76,6 +78,7 @@ DRY_DISTRO_INSTALL_PKG_CMD = {
+ }
+ 
+ DISTRO_INSTALL_PKG_CMD = {
++    'almalinux': MAYBE_RELIABLE_YUM_INSTALL,
+     'rocky': MAYBE_RELIABLE_YUM_INSTALL,
+     'eurolinux': MAYBE_RELIABLE_YUM_INSTALL,
+     'miraclelinux': MAYBE_RELIABLE_YUM_INSTALL,
+@@ -90,6 +93,7 @@ DISTRO_INSTALL_PKG_CMD = {
+ 
+ # List of base system packages required to enable ci automation
+ CI_SYSTEM_BASE_PKGS = {
++    'almalinux': ['python3-tox'],
+     'common': ['make', 'sudo', 'tar'],
+     'eurolinux': ['python3-tox'],
+     'miraclelinux': ['python3-tox'],
+@@ -285,10 +289,10 @@ def pkg_install(pkg_list, distro, test_distro=False, dry_run=False):
+         cmd = DRY_DISTRO_INSTALL_PKG_CMD[distro]
+     install_cmd.extend(cmd)
+ 
+-    if distro in ['centos', 'redhat', 'rocky', 'eurolinux']:
++    if distro in ['almalinux', 'centos', 'redhat', 'rocky', 'eurolinux']:
+         # CentOS and Redhat need epel-release to access oauthlib and jsonschema
+         subprocess.check_call(install_cmd + ['epel-release'])
+-    if distro in ['suse', 'opensuse', 'redhat', 'rocky', 'centos', 'eurolinux']:
++    if distro in ['almalinux', 'suse', 'opensuse', 'redhat', 'rocky', 'centos', 'eurolinux']:
+         pkg_list.append('rpm-build')
+     subprocess.check_call(install_cmd + pkg_list)
+ 
+diff --git a/tools/run-container b/tools/run-container
+index e049dfd..02088aa 100755
+--- a/tools/run-container
++++ b/tools/run-container
+@@ -102,7 +102,7 @@ inject_cloud_init(){
+     }
+     local t=${gitdir%/*}
+     case "$t" in
+-        */worktrees) 
++        */worktrees)
+             if [ -f "${t%worktrees}/config" ]; then
+                 gitdir="${t%worktrees}"
+             fi
+@@ -191,7 +191,7 @@ os_info() {
+ 
+ get_os_info() {
+     # run inside container, set OS_NAME, OS_VERSION
+-    # example OS_NAME are centos, debian, opensuse, rockylinux
++    # example OS_NAME are almalinux, centos, debian, opensuse, rockylinux
+     [ -n "${OS_NAME:-}" -a -n "${OS_VERSION:-}" ] && return 0
+     if [ -f /etc/os-release ]; then
+         OS_NAME=$(sh -c '. /etc/os-release; echo $ID')
+@@ -247,7 +247,7 @@ apt_install() {
+ install_packages() {
+     get_os_info || return
+     case "$OS_NAME" in
+-        centos|rocky*) yum_install "$@";;
++        almalinux|centos|rocky*) yum_install "$@";;
+         opensuse) zypper_install "$@";;
+         debian|ubuntu) apt_install "$@";;
+         *) error "Do not know how to install packages on ${OS_NAME}";
+@@ -486,16 +486,16 @@ main() {
+ 
+     local build_pkg="" build_srcpkg="" pkg_ext="" distflag=""
+     case "$OS_NAME" in
+-        centos|rocky) distflag="--distro=redhat";;
++        almalinux|centos|rocky) distflag="--distro=redhat";;
+         opensuse) distflag="--distro=suse";;
+     esac
+ 
+     case "$OS_NAME" in
+         debian|ubuntu)
+-            build_pkg="./packages/bddeb -d" 
++            build_pkg="./packages/bddeb -d"
+             build_srcpkg="./packages/bddeb -S -d"
+             pkg_ext=".deb";;
+-        centos|opensuse|rocky)
++        almalinux|centos|opensuse|rocky)
+             build_pkg="./packages/brpm $distflag"
+             build_srcpkg="./packages/brpm $distflag --srpm"
+             pkg_ext=".rpm";;
+-- 
+2.39.2
+

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

@@ -0,0 +1,261 @@
+From e0dc628ac553072891fa6607dc91b652efd99be2 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.
+
+X-downstream-only: true
+Signed-off-by: Eduardo Otubo <otubo@redhat.com>
+Signed-off-by: Ryan McCabe <rmccabe@redhat.com>
+---
+ cloudinit/net/sysconfig.py  |  1 -
+ tests/unittests/test_net.py | 28 ----------------------------
+ 2 files changed, 29 deletions(-)
+
+diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
+index ba85c4f6..e06ddee7 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"},
+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
+

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

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

SOURCES/0003-limit-permissions-on-def_log_file.patch

@@ -0,0 +1,69 @@
+From cb7b35ca10c82c9725c3527e3ec5fb8cb7c61bc0 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 39650a5b..3c2145e9 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
+

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

@@ -1,4 +1,4 @@
-From fea3e7fc6d23e988cf4a33dc03064ff31bf1d72d Mon Sep 17 00:00:00 2001
+From ffa647e83efd4293bd027e9e390274aad8a12d94 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
@@ -21,19 +21,15 @@ 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 +++++++---
+ 1 file changed, 10 insertions(+), 1 deletion(-)
- 2 files changed, 17 insertions(+), 4 deletions(-)
 
 diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
-index 3b7a1f93..f01c4236 100644
+index e06ddee7..362e8d19 100644
 --- a/cloudinit/net/sysconfig.py
 +++ b/cloudinit/net/sysconfig.py
-@@ -1029,7 +1029,16 @@ class Renderer(renderer.Renderer):
+@@ -1038,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))
@@ -42,12 +38,15 @@ index 3b7a1f93..f01c4236 100644
 +            for line in util.load_file(sysconfig_path, quiet=True).split("\n"):
 +                if "cloud-init" in line:
 +                    break
-+                if not line.startswith(
++                if not line.startswith(("NETWORKING=",
-+                    ("NETWORKING=", "IPV6_AUTOCONF=", "NETWORKING_IPV6=")
++                                        "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")
+-- 
+2.31.1
+

SOURCES/0005-Remove-race-condition-between-cloud-init-and-Network.patch

@@ -0,0 +1,148 @@
+From 386f0a82bfdfd62e506bf4251c17263260d3250a Mon Sep 17 00:00:00 2001
+From: Eduardo Otubo <otubo@redhat.com>
+Date: Fri, 7 May 2021 13:36:14 +0200
+Subject: Remove race condition between cloud-init and NetworkManager
+
+Message-id: <20200302104635.11648-1-otubo@redhat.com>
+Patchwork-id: 94098
+O-Subject: [RHEL-7.9/RHEL-8.2.0 cloud-init PATCH] Remove race condition between cloud-init and NetworkManager
+Bugzilla: 1807797
+RH-Acked-by: Cathy Avery <cavery@redhat.com>
+RH-Acked-by: Mohammed Gamal <mgamal@redhat.com>
+
+BZ: 1748015
+BRANCH: rhel7/master-18.5
+BREW: 26924611
+
+BZ: 1807797
+BRANCH: rhel820/master-18.5
+BREW: 26924957
+
+cloud-init service is set to start before NetworkManager service starts,
+but this does not avoid a race condition between them. NetworkManager
+starts before cloud-init can write `dns=none' to the file:
+/etc/NetworkManager/conf.d/99-cloud-init.conf. This way NetworkManager
+doesn't read the configuration and erases all resolv.conf values upon
+shutdown. On the next reboot neither cloud-init or NetworkManager will
+write anything to resolv.conf, leaving it blank.
+
+This patch introduces a NM reload (try-restart) at the end of cloud-init
+start up so it won't erase resolv.conf upon first shutdown.
+
+x-downstream-only: yes
+resolves: rhbz#1748015, rhbz#1807797 and rhbz#1804780
+
+Signed-off-by: Eduardo Otubo <otubo@redhat.com>
+Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
+
+This commit is a squash and also includes the folloowing commits:
+
+commit 316a17b7c02a87fa9b2981535be0b20d165adc46
+Author: Eduardo Otubo <otubo@redhat.com>
+Date:   Mon Jun 1 11:58:06 2020 +0200
+
+    Make cloud-init.service execute after network is up
+
+    RH-Author: Eduardo Otubo <otubo@redhat.com>
+    Message-id: <20200526090804.2047-1-otubo@redhat.com>
+    Patchwork-id: 96809
+    O-Subject: [RHEL-8.2.1 cloud-init PATCH] Make cloud-init.service execute after network is up
+    Bugzilla: 1803928
+    RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
+    RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
+
+    cloud-init.service needs to wait until network is fully up before
+    continuing executing and configuring its service.
+
+    Signed-off-by: Eduardo Otubo <otubo@redhat.com>
+
+    x-downstream-only: yes
+    Resolves: rhbz#1831646
+    Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
+
+commit 0422ba0e773d1a8257a3f2bf3db05f3bc7917eb7
+Author: Eduardo Otubo <otubo@redhat.com>
+Date:   Thu May 28 08:44:08 2020 +0200
+
+    Remove race condition between cloud-init and NetworkManager
+
+    RH-Author: Eduardo Otubo <otubo@redhat.com>
+    Message-id: <20200327121911.17699-1-otubo@redhat.com>
+    Patchwork-id: 94453
+    O-Subject: [RHEL-7.9/RHEL-8.2.0 cloud-init PATCHv2] Remove race condition between cloud-init and NetworkManager
+    Bugzilla: 1840648
+    RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
+    RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
+    RH-Acked-by: Cathy Avery <cavery@redhat.com>
+
+    cloud-init service is set to start before NetworkManager service starts,
+    but this does not avoid a race condition between them. NetworkManager
+    starts before cloud-init can write `dns=none' to the file:
+    /etc/NetworkManager/conf.d/99-cloud-init.conf. This way NetworkManager
+    doesn't read the configuration and erases all resolv.conf values upon
+    shutdown. On the next reboot neither cloud-init or NetworkManager will
+    write anything to resolv.conf, leaving it blank.
+
+    This patch introduces a NM reload (try-reload-or-restart) at the end of cloud-init
+    start up so it won't erase resolv.conf upon first shutdown.
+
+    x-downstream-only: yes
+
+    Signed-off-by: Eduardo Otubo otubo@redhat.com
+    Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
+
+commit e0b48a936433faea7f56dbc29dda35acf7d375f7
+Author: Eduardo Otubo <otubo@redhat.com>
+Date:   Thu May 28 08:44:06 2020 +0200
+
+    Enable ssh_deletekeys by default
+
+    RH-Author: Eduardo Otubo <otubo@redhat.com>
+    Message-id: <20200317091705.15715-1-otubo@redhat.com>
+    Patchwork-id: 94365
+    O-Subject: [RHEL-7.9/RHEL-8.2.0 cloud-init PATCH] Enable ssh_deletekeys by default
+    Bugzilla: 1814152
+    RH-Acked-by: Mohammed Gamal <mgamal@redhat.com>
+    RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
+
+    The configuration option ssh_deletekeys will trigger the generation
+    of new ssh keys for every new instance deployed.
+
+    x-downstream-only: yes
+    resolves: rhbz#1814152
+
+    Signed-off-by: Eduardo Otubo <otubo@redhat.com>
+    Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
+---
+ rhel/cloud.cfg                  | 2 +-
+ rhel/systemd/cloud-init.service | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/rhel/cloud.cfg b/rhel/cloud.cfg
+index 82e8bf62..9ecba215 100644
+--- a/rhel/cloud.cfg
++++ b/rhel/cloud.cfg
+@@ -6,7 +6,7 @@ ssh_pwauth:   0
+ 
+ mount_default_fields: [~, ~, 'auto', 'defaults,nofail,x-systemd.requires=cloud-init.service', '0', '2']
+ resize_rootfs_tmp: /dev
+-ssh_deletekeys:   0
++ssh_deletekeys:   1
+ ssh_genkeytypes:  ~
+ syslog_fix_perms: ~
+ disable_vmware_customization: false
+diff --git a/rhel/systemd/cloud-init.service b/rhel/systemd/cloud-init.service
+index d0023a05..0b3d796d 100644
+--- a/rhel/systemd/cloud-init.service
++++ b/rhel/systemd/cloud-init.service
+@@ -5,6 +5,7 @@ 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
+-- 
+2.31.1
+

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

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

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

@@ -0,0 +1,65 @@
+From b545a0cbabe8924d048b7172b30e7aad59ed32d5 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 3c2145e9..71672e10 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 9ecba215..cbee197a 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', '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
+

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

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

SOURCES/ci-Align-rhel-custom-files-with-upstream-1431.patch

@@ -0,0 +1,257 @@
+From 5c99ba05086b1ec83ce7e0c64edb4add4b47d923 Mon Sep 17 00:00:00 2001
+From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+Date: Thu, 19 May 2022 11:14:39 +0200
+Subject: [PATCH 3/4] Align rhel custom files with upstream (#1431)
+
+RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-MergeRequest: 65: Align rhel custom files with upstream (#1431)
+RH-Commit: [1/2] 5d9067175688b1006472a477b0916b81c73d5e07
+RH-Bugzilla: 2082071
+RH-Acked-by: Mohamed Gamal Morsy <mmorsy@redhat.com>
+RH-Acked-by: Eduardo Otubo <otubo@redhat.com>
+RH-Acked-by: Vitaly Kuznetsov <vkuznets@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.35.3
+

SOURCES/ci-Ensure-network-ready-before-cloud-init-service-runs-.patch

@@ -0,0 +1,43 @@
+From 5bed421bffa0f1937c366e17ea8babaacf801536 Mon Sep 17 00:00:00 2001
+From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+Date: Wed, 14 Dec 2022 09:16:15 +0100
+Subject: [PATCH] Ensure network ready before cloud-init service runs on RHEL
+ (#1893)
+
+RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-MergeRequest: 86: Ensure network ready before cloud-init service runs on RHEL (#1893)
+RH-Bugzilla: 2153182
+RH-Acked-by: Mohamed Gamal Morsy <mmorsy@redhat.com>
+RH-Acked-by: Camilla Conte <cconte@redhat.com>
+RH-Commit: [1/1] 7eff85c95da26f4083ddb217b1ac76bbac661f26
+
+Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2153182
+
+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
+

SOURCES/ci-Remove-rhel-specific-files.patch

@@ -0,0 +1,373 @@
+From d43f0d93386f123892451d923c2b3c6fe7130c39 Mon Sep 17 00:00:00 2001
+From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+Date: Thu, 19 May 2022 11:38:22 +0200
+Subject: [PATCH 4/4] Remove rhel specific files
+
+RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-MergeRequest: 65: Align rhel custom files with upstream (#1431)
+RH-Commit: [2/2] 5e31f0bcb500682e7746ccbd2e628c2ef339d6c6
+RH-Bugzilla: 2082071
+RH-Acked-by: Mohamed Gamal Morsy <mmorsy@redhat.com>
+RH-Acked-by: Eduardo Otubo <otubo@redhat.com>
+RH-Acked-by: Vitaly Kuznetsov <vkuznets@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>
+---
+ redhat/cloud-init.spec.template       | 21 ++------
+ 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 cbee197a..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', '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.35.3
+

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

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

SOURCES/ci-Revert-Use-Network-Manager-and-Netplan-as-default-re.patch

@@ -0,0 +1,75 @@
+From 02e7b89c157f8c3243f0d91cf5652cf27db44b72 Mon Sep 17 00:00:00 2001
+From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+Date: Mon, 8 Aug 2022 10:10:26 +0200
+Subject: [PATCH 2/2] Revert "Use Network-Manager and Netplan as default
+ renderers for RHEL and Fedora (#1465)"
+
+RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-MergeRequest: 81: Revert "Use Network-Manager and Netplan as default renderers for RHEL and Fedora (#1465)"
+RH-Commit: [2/2] 746b2e33356376e250b799261031676174e8ccc9
+RH-Bugzilla: 2107464 2110066 2117526 2104393 2098624
+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 13ded463a6a0b1b0bf0dffc0a997f006dd25c4f3.
+
+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.27.0
+

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

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

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

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

SOURCES/ci-Support-EC2-tags-in-instance-metadata-1309.patch

@@ -0,0 +1,164 @@
+From fbec3008305845072a787f46008bbb82d89dec53 Mon Sep 17 00:00:00 2001
+From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+Date: Mon, 30 May 2022 16:46:41 +0200
+Subject: [PATCH] Support EC2 tags in instance metadata (#1309)
+
+RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-MergeRequest: 70: Support EC2 tags in instance metadata (#1309)
+RH-Commit: [1/1] 2497547016173a4c6e7d3c900f80de390d445c44
+RH-Bugzilla: 2082686
+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.27.0
+

SOURCES/ci-Use-Network-Manager-and-Netplan-as-default-renderers.patch

@@ -0,0 +1,110 @@
+From 13ded463a6a0b1b0bf0dffc0a997f006dd25c4f3 Mon Sep 17 00:00:00 2001
+From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+Date: Thu, 19 May 2022 15:51:27 +0200
+Subject: [PATCH 2/4] Use Network-Manager and Netplan as default renderers for
+ RHEL and Fedora (#1465)
+
+RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-MergeRequest: 57: Add native NetworkManager support (#1224)
+RH-Commit: [2/2] f2f977564bea496b0d76c0cef242959d03c2c73e
+RH-Bugzilla: 2059872
+RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
+RH-Acked-by: Jon Maloy <jmaloy@redhat.com>
+RH-Acked-by: Eduardo Otubo <otubo@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.35.3
+

SOURCES/ci-cc_set_hostname-ignore-var-lib-cloud-data-set-hostna.patch

@@ -0,0 +1,84 @@
+From 836be9931cad907dc71fc9e769d185e09a33e120 Mon Sep 17 00:00:00 2001
+From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+Date: Tue, 31 Jan 2023 17:14:42 +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: 90: cc_set_hostname: ignore /var/lib/cloud/data/set-hostname if it's empty (#1967)
+RH-Bugzilla: 2165945
+RH-Acked-by: Mohamed Gamal Morsy <mmorsy@redhat.com>
+RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
+RH-Commit: [1/1] 2efa7c1ac15932be38bd86b9b76f8f3b18038de6
+
+Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2165945
+
+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 eb0ca328..9d78f6ad 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 fd994c4e..a819039b 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
+@@ -204,5 +205,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.37.3
+

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

SOURCES/ci-setup.py-adjust-udev-rules-default-path-1513.patch

@@ -0,0 +1,57 @@
+From ed7060ac1d5003f70fc3da4d6006a1a958a47b04 Mon Sep 17 00:00:00 2001
+From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+Date: Mon, 20 Jun 2022 10:31:14 +0200
+Subject: [PATCH 2/2] setup.py: adjust udev/rules default path (#1513)
+
+RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-MergeRequest: 80: setup.py: adjust udev/rules default path (#1513)
+RH-Commit: [2/2] 2cb64b004acbe1b6a30f943b0da51d2d1f2f0d50 (eesposit/cloud-init)
+RH-Bugzilla: 2096269
+RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
+RH-Acked-by: Mohamed Gamal Morsy <mmorsy@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.31.1
+

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

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

SPECS/cloud-init.spec

@@ -5,58 +5,53 @@
 %global debug_package %{nil}
 
 Name:           cloud-init
-Version:        23.4
+Version:        22.1
-Release:        7%{?dist}.8
+Release:        6%{?dist}.2.alma
 Summary:        Cloud instance init scripts
 
 Group:          System Environment/Base
 License:        GPLv3
-URL:            https://github.com/canonical/cloud-init
+URL:            http://launchpad.net/cloud-init
-Source0:        https://github.com/canonical/cloud-init/archive/refs/tags/%{version}.tar.gz
+Source0:        https://launchpad.net/cloud-init/trunk/%{version}/+download/%{name}-%{version}.tar.gz
 Source1:        cloud-init-tmpfiles.conf
 
-Patch0003: 0003-Do-not-write-NM_CONTROLLED-no-in-generated-interface.patch
+Patch0001: 0001-Add-initial-redhat-setup.patch
+Patch0002: 0002-Do-not-write-NM_CONTROLLED-no-in-generated-interface.patch
+Patch0003: 0003-limit-permissions-on-def_log_file.patch
 Patch0004: 0004-include-NOZEROCONF-yes-in-etc-sysconfig-network.patch
-Patch0005: 0005-settings.py-update-settings-for-rhel.patch
+Patch0005: 0005-Remove-race-condition-between-cloud-init-and-Network.patch
-Patch0013: 0013-rhel-cloud.cfg-remove-ssh_genkeytypes-in-settings.py.patch
+Patch0006: 0006-rhel-cloud.cfg-remove-ssh_genkeytypes-in-settings.py.patch
-# For RHEL-7277 - [RFE] [Azure][RHEL8][Network][cloud-init] Can not acquire IPv6 address
+# For bz#2059872 - [RHEL-8]Rebase cloud-init from Fedora so it can configure networking using NM keyfiles
-Patch14: ci-net-network_manager-do-not-set-may-fail-to-False-for.patch
+Patch7: ci-Add-native-NetworkManager-support-1224.patch
-# For RHEL-7277 - [RFE] [Azure][RHEL8][Network][cloud-init] Can not acquire IPv6 address
+# For bz#2059872 - [RHEL-8]Rebase cloud-init from Fedora so it can configure networking using NM keyfiles
-Patch15: ci-net-allow-dhcp6-configuration-from-generate_fallback.patch
+Patch8: ci-Use-Network-Manager-and-Netplan-as-default-renderers.patch
-# For RHEL-17610 - [RHEL-8] NetworkManagerActivator brings up interface failed when using sysconfig renderer
+# For bz#2082071 - Align cloud.cfg file and systemd with cloud-init upstream .tmpl files
-Patch16: ci-net-nm-check-for-presence-of-ifcfg-files-when-nm-con.patch
+Patch9: ci-Align-rhel-custom-files-with-upstream-1431.patch
-# For RHEL-21530 - [RHEL-8.10]subp.py[WARNING]: skipping /etc/cloud/clean.d/README when do cloud-init clean
+# For bz#2082071 - Align cloud.cfg file and systemd with cloud-init upstream .tmpl files
-Patch17: ci-fix-clean-stop-warning-when-running-clean-command-47.patch
+Patch10: ci-Remove-rhel-specific-files.patch
-# For RHEL-21530 - [RHEL-8.10]subp.py[WARNING]: skipping /etc/cloud/clean.d/README when do cloud-init clean
+# For bz#2082686 - [cloud][init] Add support for reading tags from instance metadata
-Patch18: ci-test-jsonschema-Pin-jsonschema-version-4781.patch
+Patch11: ci-Support-EC2-tags-in-instance-metadata-1309.patch
-# For RHEL-22248 - [Azure][RHEL-8] cloud-init-23.4 cannot read "- Azure" datasource_list format
+# For bz#2096269 - Adjust udev/rules default path[RHEL-8]
-Patch19: ci-Revert-Use-grep-for-faster-parsing-of-cloud-config-i.patch
+Patch12: ci-setup.py-adjust-udev-rules-default-path-1513.patch
-# For RHEL-21323 - [rhel-8] The schema WARNING info for network-config.json is not suitable in cloud-init-23.4
+# For bz#2107464 - [RHEL-8.7] Cannot run sysconfig when changing the priority of network renderers
-Patch20: ci-ci-Pin-pytest-8.0.0.-4816.patch
+# For bz#2110066 - DNS integration with OpenStack/cloud-init/NetworkManager is not working
-# For RHEL-21323 - [rhel-8] The schema WARNING info for network-config.json is not suitable in cloud-init-23.4
+# For bz#2117526 - [RHEL8.7] Revert patch of configuring networking by NM keyfiles
-Patch21: ci-fix-Add-types-to-network-v1-schema-4841.patch
+# For bz#2104393 - [RHEL-8.7]Failed to config static IP and IPv6 according to VMware Customization Config File
-# For RHEL-21290 - Unknown lvalue 'ConditionEnvironment' in section 'Unit' for /usr/lib/systemd/system/cloud-init.target,cloud-init.service
+# For bz#2098624 - [RHEL-8.7] IPv6 not workable when cloud-init configure network using NM keyfiles
-Patch22: ci-Revert-systemd-Standardize-cloud-init-systemd-enable.patch
+Patch13: ci-Revert-Add-native-NetworkManager-support-1224.patch
-# For RHEL-28817 - [RHEL 8.10] cloud-init 23.4 returns 2 on recoverable errors instead of 0
+# For bz#2107464 - [RHEL-8.7] Cannot run sysconfig when changing the priority of network renderers
-Patch23: ci-Retain-exit-code-in-cloud-init-status-for-recoverabl.patch
+# For bz#2110066 - DNS integration with OpenStack/cloud-init/NetworkManager is not working
-# For RHEL-27134 - [rhel-8]cloud-init fails to configure DNS/search domains for network-config v1
+# For bz#2117526 - [RHEL8.7] Revert patch of configuring networking by NM keyfiles
-Patch24: ci-fix-Correct-v2-NetworkManager-route-rendering-4637.patch
+# For bz#2104393 - [RHEL-8.7]Failed to config static IP and IPv6 according to VMware Customization Config File
-# For RHEL-27134 - [rhel-8]cloud-init fails to configure DNS/search domains for network-config v1
+# For bz#2098624 - [RHEL-8.7] IPv6 not workable when cloud-init configure network using NM keyfiles
-Patch25: ci-feat-apply-global-DNS-to-interfaces-in-network-manag.patch
+Patch14: ci-Revert-Use-Network-Manager-and-Netplan-as-default-re.patch
-# For RHEL-29710 - Suggest to backport patch ff40d1a to undeprecate 'network' in schema route definition [rhel-8.10.0.z]
+# For bz#2153182 - [RHEL-8] Ensure network ready before cloud-init service runs on RHEL [rhel-8.7.0.z]
-Patch26: ci-fix-Undeprecate-network-in-schema-route-definition-5.patch
+Patch15: ci-Ensure-network-ready-before-cloud-init-service-runs-.patch
-# For RHEL-32841 - [cloud-init][ESXi]VMware datasource resets on every boot causing it to lose network configuration [rhel-8.10.z]
+# For bz#2165945 - systemd[1]: Failed to start Initial cloud-init job after reboot system via sysrq 'b' [RHEL-8] [rhel-8.7.0.z]
-Patch27: ci-fix-Fall-back-to-cached-local-ds-if-no-valid-ds-foun.patch
+Patch16: ci-cc_set_hostname-ignore-var-lib-cloud-data-set-hostna.patch
-# For RHEL-36701 - DataSourceNoCloudNet not configurable via config files [rhel-8.10.z]
+
-Patch28: ci-fix-Always-use-single-datasource-if-specified-5098.patch
+# AlmaLinux patches
-# For RHEL-40418 - [Cloud-init] CloudstackDataSource cannot work with NetworkManager [rhel-8.10.z]
+Patch100: 0001-Fix-and-Improve-AlmaLinux-support.patch
-Patch29: ci-fix-cloudstack-Use-parsed-lease-file-for-virtual-rou.patch
-# For RHEL-46013 - [RHEL-8] cloud-init fails to configure DNS search domains [rhel-8.10.z]
-Patch30: ci-feat-sysconfig-Add-DNS-from-interface-config-to-reso.patch
-# For RHEL-49742 - [Cloud-init] [RHEL-8.10] Password reset feature broken with CloudstackDataSource
-Patch31: ci-fix-Clean-cache-if-no-datasource-fallback-5499.patch
-# For RHEL-54155 - [RHEL 8.10] cloud-init schema validation fails.
-Patch32: ci-fix-Add-subnet-ipv4-ipv6-to-network-schema-5191.patch
 
 BuildArch:      noarch
 
@@ -144,9 +139,12 @@ cp -p %{SOURCE1} $RPM_BUILD_ROOT/%{_tmpfilesdir}/%{name}.conf
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rsyslog.d
 cp -p tools/21-cloudinit.conf $RPM_BUILD_ROOT/%{_sysconfdir}/rsyslog.d/21-cloudinit.conf
 
+# Make installed NetworkManager hook name less generic
+mv $RPM_BUILD_ROOT/etc/NetworkManager/dispatcher.d/hook-network-manager \
+   $RPM_BUILD_ROOT/etc/NetworkManager/dispatcher.d/cloud-init-azure-hook
 
 [ ! -d $RPM_BUILD_ROOT/usr/lib/systemd/system-generators ] && mkdir -p $RPM_BUILD_ROOT/usr/lib/systemd/system-generators
-python3 tools/render-template --variant rhel systemd/cloud-init-generator.tmpl > $RPM_BUILD_ROOT/usr/lib/systemd/system-generators/cloud-init-generator
+python3 tools/render-cloudcfg --variant rhel systemd/cloud-init-generator.tmpl > $RPM_BUILD_ROOT/usr/lib/systemd/system-generators/cloud-init-generator
 chmod 755 $RPM_BUILD_ROOT/usr/lib/systemd/system-generators/cloud-init-generator
 
 # installing man pages
@@ -170,27 +168,7 @@ if [ $1 -eq 1 ] ; then
     /bin/systemctl enable cloud-init-local.service >/dev/null 2>&1 || :
     /bin/systemctl enable cloud-init.target        >/dev/null 2>&1 || :
 elif [ $1 -eq 2 ]; then
-    # Upgrade
+    # Upgrade. If the upgrade is from a version older than 0.7.9-8,
-    # RHBZ 2210012 - check for null ssh_genkeytypes value in cloud.cfg that
-    # breaks ssh connectivity after upgrade to a newer version of cloud-init.
-    if [ -f  %{_sysconfdir}/cloud/cloud.cfg.rpmnew ] && grep -q '^\s*ssh_genkeytypes:\s*~\s*$'  %{_sysconfdir}/cloud/cloud.cfg ; then
-       echo "***********************************************"
-       echo "*** WARNING!!!! ***"
-       echo ""
-       echo "ssh_genkeytypes set to null in /etc/cloud/cloud.cfg!"
-       echo "SSH access might be broken after reboot. Please check the following KCS"
-       echo "for more detailed information:"
-       echo ""
-       echo "https://access.redhat.com/solutions/6988034"
-       echo ""
-       echo "Please reconcile the differences between /etc/cloud/cloud.cfg and "
-       echo "/etc/cloud/cloud.cfg.rpmnew and update ssh_genkeytypes configuration in "
-       echo "/etc/cloud/cloud.cfg to a list of keytype values, something like:"
-       echo "ssh_genkeytypes:  ['rsa', 'ecdsa', 'ed25519']"
-       echo ""
-       echo "************************************************"
-    fi
-    # If the upgrade is from a version older than 0.7.9-8,
     # there will be stale systemd config
     /bin/systemctl is-enabled cloud-config.service >/dev/null 2>&1 &&
       /bin/systemctl reenable cloud-config.service >/dev/null 2>&1 || :
@@ -222,21 +200,6 @@ fi
 %postun
 %systemd_postun cloud-config.service cloud-config.target cloud-final.service cloud-init.service cloud-init.target cloud-init-local.service
 
-if [ $1 -eq 0 ] ; then
-    # warn during package removal not upgrade
-    if [ -f /etc/ssh/sshd_config.d/50-cloud-init.conf ] ; then
-	echo "/etc/ssh/sshd_config.d/50-cloud-init.conf not removed"
-    fi
-
-    if [ -f /etc/NetworkManager/conf.d/99-cloud-init.conf ] ; then
-	echo "/etc/NetworkManager/conf.d/99-cloud-init.conf not removed"
-    fi
-
-    if [ -f /etc/NetworkManager/conf.d/30-cloud-init-ip6-addr-gen-mode.conf ] ; then
-	echo "/etc/NetworkManager/conf.d/30-cloud-init-ip6-addr-gen-mode.conf not removed"
-    fi
-fi
-
 %files
 %license LICENSE
 %config(noreplace) %{_sysconfdir}/cloud/cloud.cfg
@@ -261,6 +224,8 @@ fi
 %{_mandir}/man1/*
 %dir %verify(not mode) /run/cloud-init
 %dir /var/lib/cloud
+/etc/NetworkManager/dispatcher.d/cloud-init-azure-hook
+/etc/dhcp/dhclient-exit-hooks.d/hook-dhclient
 %{_udevrulesdir}/66-azure-ephemeral.rules
 %{_datadir}/bash-completion/completions/cloud-init
 %{_bindir}/cloud-id
@@ -272,168 +237,18 @@ fi
 %config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf
 
 %changelog
-* Tue Aug 20 2024 Jon Maloy <jmaloy@redhat.com> - 23.4-7.el8_10.8
+* Tue Feb 21 2023 Elkhan Mammadli <elkhan@almalinux.org> - 22.1-6.el8_7.2.alma
-- ci-fix-Add-subnet-ipv4-ipv6-to-network-schema-5191.patch [RHEL-54155]
+- Fix and Improve AlmaLinux support
-- Resolves: RHEL-54155
-  ([RHEL 8.10] cloud-init schema validation fails.)
 
-* Thu Jul 25 2024 Miroslav Rezanina <mrezanin@redhat.com> - 23.4-7.el8_10.7
+* Tue Feb 14 2023 Jon Maloy <jmaloy@redhat.com> - 22.1-6.el8_7.2
-- ci-fix-Clean-cache-if-no-datasource-fallback-5499.patch [RHEL-49742]
+- ci-cc_set_hostname-ignore-var-lib-cloud-data-set-hostna.patch [bz#2165945]
-- Resolves: RHEL-49742
+- Resolves: bz#2165945
-  ([Cloud-init] [RHEL-8.10] Password reset feature broken with CloudstackDataSource)
+  (systemd[1]: Failed to start Initial cloud-init job after reboot system via sysrq 'b' [RHEL-8] [rhel-8.7.0.z])
 
-* Tue Jul 09 2024 Jon Maloy <jmaloy@redhat.com> - 23.4-7.el8_10.6
+* Wed Dec 28 2022 Camilla Conte <cconte@redhat.com> - 22.1-6.el8_7
-- ci-feat-sysconfig-Add-DNS-from-interface-config-to-reso.patch [RHEL-46013]
+- ci-Ensure-network-ready-before-cloud-init-service-runs-.patch [bz#2153182]
-- Resolves: RHEL-46013
+- Resolves: bz#2153182
-  ([RHEL-8] cloud-init fails to configure DNS search domains [rhel-8.10.z])
+  ([RHEL-8] Ensure network ready before cloud-init service runs on RHEL [rhel-8.7.0.z])
-
-* Tue Jul 09 2024 Miroslav Rezanina <mrezanin@redhat.com> - 23.4-7.el8_10.5
-- ci-fix-cloudstack-Use-parsed-lease-file-for-virtual-rou.patch [RHEL-40418]
-- Resolves: RHEL-40418
-  ([Cloud-init] CloudstackDataSource cannot work with NetworkManager [rhel-8.10.z])
-
-* Wed May 29 2024 Jon Maloy <jmaloy@redhat.com> - 23.4-7.el8.3
-- ci-fix-Always-use-single-datasource-if-specified-5098.patch [RHEL-36701]
-- Resolves: RHEL-36701
-  (DataSourceNoCloudNet not configurable via config files [rhel-8.10.z])
-
-* Tue Apr 23 2024 Miroslav Rezanina <mrezanin@redhat.com> - 23.4-7.el8_10.2
-- ci-fix-Fall-back-to-cached-local-ds-if-no-valid-ds-foun.patch [RHEL-32841]
-- Resolves: RHEL-32841
-  ([cloud-init][ESXi]VMware datasource resets on every boot causing it to lose network configuration [rhel-8.10.z])
-
-* Fri Apr 05 2024 Jon Maloy <jmaloy@redhat.com> - 23.4-7.el8.1
-- ci-fix-Correct-v2-NetworkManager-route-rendering-4637.patch [RHEL-27134]
-- ci-feat-apply-global-DNS-to-interfaces-in-network-manag.patch [RHEL-27134]
-- ci-fix-Undeprecate-network-in-schema-route-definition-5.patch [RHEL-29710]
-- Resolves: RHEL-27134
-  ([rhel-8]cloud-init fails to configure DNS/search domains for network-config v1)
-- Resolves: RHEL-29710
-  (Suggest to backport patch ff40d1a to undeprecate 'network' in schema route definition [rhel-8.10.0.z])
-
-* Thu Mar 14 2024 Miroslav Rezanina <mrezanin@redhat.com> - 23.4-7
-- ci-Retain-exit-code-in-cloud-init-status-for-recoverabl.patch [RHEL-28817]
-- Resolves: RHEL-28817
-  ([RHEL 8.10] cloud-init 23.4 returns 2 on recoverable errors instead of 0)
-
-* Mon Mar 11 2024 Miroslav Rezanina <mrezanin@redhat.com> - 23.4-6
-- ci-Revert-systemd-Standardize-cloud-init-systemd-enable.patch [RHEL-21290]
-- Resolves: RHEL-21290
-  (Unknown lvalue 'ConditionEnvironment' in section 'Unit' for /usr/lib/systemd/system/cloud-init.target,cloud-init.service)
-
-* Mon Feb 26 2024 Miroslav Rezanina <mrezanin@redhat.com> - 23.4-5
-- ci-ci-Pin-pytest-8.0.0.-4816.patch [RHEL-21323]
-- ci-fix-Add-types-to-network-v1-schema-4841.patch [RHEL-21323]
-- Resolves: RHEL-21323
-  ([rhel-8] The schema WARNING info for network-config.json is not suitable in cloud-init-23.4)
-
-* Fri Feb 02 2024 Jon Maloy <jmaloy@redhat.com> - 23.4-4
-- ci-Revert-Use-grep-for-faster-parsing-of-cloud-config-i.patch [RHEL-22248]
-- Resolves: RHEL-22248
-  ([Azure][RHEL-8] cloud-init-23.4 cannot read "- Azure" datasource_list format)
-
-* Fri Feb 02 2024 Jon Maloy <jmaloy@redhat.com> - 23.4-3
-- ci-fix-clean-stop-warning-when-running-clean-command-47.patch [RHEL-21530]
-- ci-test-jsonschema-Pin-jsonschema-version-4781.patch [RHEL-21530]
-- Resolves: RHEL-21530
-  ([RHEL-8.10]subp.py[WARNING]: skipping /etc/cloud/clean.d/README when do cloud-init clean)
-
-* Tue Jan 16 2024 Jon Maloy <jmaloy@redhat.com> - 23.4-2
-- ci-net-network_manager-do-not-set-may-fail-to-False-for.patch [RHEL-7277]
-- ci-net-allow-dhcp6-configuration-from-generate_fallback.patch [RHEL-7277]
-- ci-net-nm-check-for-presence-of-ifcfg-files-when-nm-con.patch [RHEL-17610]
-- Resolves: RHEL-7277
-  ([RFE] [Azure][RHEL8][Network][cloud-init] Can not acquire IPv6 address)
-- Resolves: RHEL-17610
-  ([RHEL-8] NetworkManagerActivator brings up interface failed when using sysconfig renderer)
-
-* Mon Jan 8 2024 Jon Maloy <jmaloy@redhat.com> - 23.4-1
-- Rebase to 23.4.1 [RHEL-18314]
-- Resolves: RHEL-18314
-  ([RHEL-8]Rebase cloud-init to 23.4)
-
-* Thu Nov 23 2023 Camilla Conte <cconte@redhat.com> - 23.1.1-12
-- ci-rhel-cloud.cfg-remove-ssh_genkeytypes-in-settings.py.patch [RHEL-16572]
-- Resolves: RHEL-16572
-  ([cloud-init][rhel-8] Backport the patch "rhel/cloud.cfg: remove ssh_genkeytypes in settings.py and set in cloud.cfg" to fix settings.py)
-
-* Mon Sep 18 2023 Camilla Conte <cconte@redhat.com> - 23.1.1-11
-- ci-net-fix-ipv6_dhcpv6_stateful-stateless-slaac-configu.patch [bz#2046491]
-- Resolves: bz#2046491
-  (cloud-init enable both DHCPv4 and DHCPv6 when network type is ipv6_dhcpv6-stateful/ipv6_dhcpv6-stateless)
-- Resolves: RHEL-2325
-  ([RHEL8.9][cloud-init] Not inform user during upgrade that cloud-init generated config files are left )
-
-* Fri Aug 25 2023 Camilla Conte <cconte@redhat.com> - 23.1.1-10
-- Resolves: bz#2233047
-  ([RHEL 8.9] Inform user when cloud-init generated config files are left during uninstalling)
-
-* Wed Aug 09 2023 Jon Maloy <jmaloy@redhat.com> - 23.1.1-9
-- ci-NM-renderer-set-default-IPv6-addr-gen-mode-for-all-i.patch [bz#2229460]
-- Resolves: bz#2229460
-  ([rhel-8.9] [RFE] Configure "ipv6.addr-gen-mode=eui64' as default in NetworkManager)
-
-* Thu Jul 27 2023 Camilla Conte <cconte@redhat.com> - 23.1.1-8
-- ci-DS-VMware-modify-a-few-log-level-4284.patch [bz#2223810]
-- Resolves: bz#2223810
-  ([cloud-init] [RHEL8.9]There are warning logs if dev has more than one IPV6 address on ESXi)
-
-* Tue Jul 25 2023 Miroslav Rezanina <mrezanin@redhat.com> - 23.1.1-7
-- ci-logging-keep-current-file-mode-of-log-file-if-its-st.patch [bz#2222501]
-- Resolves: bz#2222501
-  (Don't change log permissions if they are already more restrictive [rhel-8])
-
-* Mon Jul 10 2023 Miroslav Rezanina <mrezanin@redhat.com> - 23.1.1-6
-- ci-Revert-Manual-revert-Use-Network-Manager-and-Netplan.patch [bz#2219528]
-- ci-Revert-Revert-Add-native-NetworkManager-support-1224.patch [bz#2219528]
-- ci-nm-generate-ipv6-stateful-dhcp-config-at-par-with-sy.patch [bz#2219528]
-- ci-network_manager-add-a-method-for-ipv6-static-IP-conf.patch [bz#2219528]
-- ci-net-sysconfig-enable-sysconfig-renderer-if-network-m.patch [bz#2219528]
-- ci-network-manager-Set-higher-autoconnect-priority-for-.patch [bz#2219528]
-- ci-Set-default-renderer-as-sysconfig-for-centos-rhel-41.patch [bz#2219528]
-- Resolves: bz#2219528
-  ([RHEL8] Support configuring network by NM keyfiles)
-
-* Thu Jun 29 2023 Jon Maloy <jmaloy@redhat.com> - 23.1.1-4
-- ci-Add-warning-during-upgrade-from-an-old-version-with-.patch [bz#2210012]
-- Resolves: bz#2210012
-  ([cloud-init] System didn't generate ssh host keys and lost ssh connection after cloud-init removed them with updated cloud-init package.)
-
-* Wed May 03 2023 Jon Maloy <jmaloy@redhat.com> - 23.1.1-3
-- ci-Don-t-change-permissions-of-netrules-target-2076.patch [bz#2182947]
-- ci-Make-user-vendor-data-sensitive-and-remove-log-permi.patch [bz#2190081]
-- Resolves: bz#2182947
-  (Request to backport "Don't change permissions of netrules target (#2076)")
-- Resolves: bz#2190081
-  (CVE-2023-1786 cloud-init: sensitive data could be exposed in logs [rhel-8])
-
-* Tue Apr 25 2023 Jon Maloy <jmaloy@redhat.com> - 23.1.1-2
-- ci-rhel-make-sure-previous-hostname-file-ends-with-a-ne.patch [bz#2182407]
-- Resolves: bz#2182407
-  (cloud-init strips new line from "/etc/hostname" when processing "/var/lib/cloud/data/previous-hostname")
-
-* Fri Apr 21 2023 Jon Maloy <jmaloy@redhat.com> - 23.1.1-1
-- limit-permissions-on-def_log_file.patch
-- Resolves bz#1424612
-- include-NOZEROCONF-yes-in-etc-sysconfig-network.patch
-- Resolves bz#1653131
-- Rebase to 23.1.1 [bz#2172821]
-- Resolves: bz#2172821
-
-* Mon Jan 30 2023 Camilla Conte <cconte@redhat.com> - 22.1-8
-- ci-cc_set_hostname-ignore-var-lib-cloud-data-set-hostna.patch [bz#2162258]
-- Resolves: bz#2162258
-  (systemd[1]: Failed to start Initial cloud-init job after reboot system via sysrq 'b' [RHEL-8])
-
-* Wed Dec 28 2022 Camilla Conte <cconte@redhat.com> - 22.1-7
-- ci-Ensure-network-ready-before-cloud-init-service-runs-.patch [bz#2151861]
-- Resolves: bz#2151861
-  ([RHEL-8] Ensure network ready before cloud-init service runs on RHEL)
-
-* Mon Oct 17 2022 Jon Maloy <jmaloy@redhat.com> - 22.1-6
-- ci-cloud.cfg.tmpl-make-sure-centos-settings-are-identic.patch [bz#2115576]
-- Resolves: bz#2115576
-  (cloud-init configures user "centos" or "rhel" instead of "cloud-user" with cloud-init-22.1)
 
 * Wed Aug 17 2022 Jon Maloy <jmaloy@redhat.com> - 22.1-5
 - ci-Revert-Add-native-NetworkManager-support-1224.patch [bz#2107464 bz#2110066 bz#2117526 bz#2104393 bz#2098624]
@@ -478,8 +293,6 @@ fi
 * Fri Apr 01 2022 Camilla Conte <cconte@redhat.com> - 21.1-15
 - ci-Detect-a-Python-version-change-and-clear-the-cache-8.patch [bz#1935826]
 - ci-Fix-MIME-policy-failure-on-python-version-upgrade-93.patch [bz#1935826]
-- Resolves: bz#1935826
-  ([rhel-8] Cloud-init init stage fails after upgrade from RHEL7 to RHEL8.)
 
 * Fri Feb 25 2022 Jon Maloy <jmaloy@redhat.com> - 21.1-14
 - ci-Fix-IPv6-netmask-format-for-sysconfig-1215.patch [bz#2046540]