Merge branch 'c8' into a8

.cloud-init.metadata

@@ -1 +1 @@
-e73116733f5636eb4bc1a5e47e802c3635b9bfa2 SOURCES/23.4.tar.gz
+2ae378aa2ae23b34b0ff123623ba5e2fbdc4928d SOURCES/cloud-init-21.1.tar.gz

.gitignore

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

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

@@ -0,0 +1,561 @@
+From 074cb9b011623849cfa95c1d7cc813bb28f03ff0 Mon Sep 17 00:00:00 2001
+From: Eduardo Otubo <otubo@redhat.com>
+Date: Fri, 7 May 2021 13:36:03 +0200
+Subject: Add initial redhat setup
+
+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           |  67 +++-
+ 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       | 530 ++++++++++++++++++++++++++
+ 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                 |  27 ++
+ redhat/scripts/git-backport-diff      | 327 ++++++++++++++++
+ redhat/scripts/git-compile-check      | 215 +++++++++++
+ redhat/scripts/process-patches.sh     |  77 ++++
+ 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                              |  23 +-
+ tools/read-version                    |  28 +-
+ 30 files changed, 1579 insertions(+), 50 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 aaf71366..97ef649a 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
+@@ -31,7 +94,7 @@ CHEF_DIRS = tuple([
+     '/var/lib/chef',
+     '/var/cache/chef',
+     '/var/backups/chef',
+-    '/var/run/chef',
++    '/run/chef',
+ ])
+ REQUIRED_CHEF_DIRS = tuple([
+     '/etc/chef',
+diff --git a/cloudinit/settings.py b/cloudinit/settings.py
+index 91e1bfe7..e690c0fd 100644
+--- a/cloudinit/settings.py
++++ b/cloudinit/settings.py
+@@ -47,13 +47,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 cbacf48e..d5cd01a4 100755
+--- a/setup.py
++++ b/setup.py
+@@ -125,14 +125,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/*.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 = {
+@@ -142,9 +134,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()])
+@@ -245,14 +234,11 @@ if not in_virtualenv():
+         INITSYS_ROOTS[k] = "/" + INITSYS_ROOTS[k]
+ 
+ data_files = [
+-    (ETC + '/cloud', [render_tmpl("config/cloud.cfg.tmpl")]),
++    (ETC + '/bash_completion.d', ['bash_completion/cloud-init']),
+     (ETC + '/cloud/cloud.cfg.d', glob('config/cloud.cfg.d/*')),
+     (ETC + '/cloud/templates', glob('templates/*')),
+-    (USR_LIB_EXEC + '/cloud-init', ['tools/ds-identify',
+-                                    'tools/uncloud-init',
++    (USR_LIB_EXEC + '/cloud-init', ['tools/uncloud-init',
+                                     'tools/write-ssh-key-fingerprints']),
+-    (USR + '/share/bash-completion/completions',
+-     ['bash_completion/cloud-init']),
+     (USR + '/share/doc/cloud-init', [f for f in glob('doc/*') if is_f(f)]),
+     (USR + '/share/doc/cloud-init/examples',
+         [f for f in glob('doc/examples/*') if is_f(f)]),
+@@ -263,8 +249,7 @@ if not platform.system().endswith('BSD'):
+     data_files.extend([
+         (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')])
+     ])
+ # Use a subclass for install that handles
+ # adding on the right init system configuration files
+@@ -286,8 +271,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.27.0
+

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

@@ -0,0 +1,262 @@
+From 472c2b5d4342b6ab6ce1584dc39bed0e6c1ca2e7 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  |  2 +-
+ tests/unittests/test_net.py | 28 ----------------------------
+ 2 files changed, 1 insertion(+), 29 deletions(-)
+
+diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
+index 99a4bae4..3d276666 100644
+--- a/cloudinit/net/sysconfig.py
++++ b/cloudinit/net/sysconfig.py
+@@ -289,7 +289,7 @@ class Renderer(renderer.Renderer):
+     #                                         details about this)
+ 
+     iface_defaults = {
+-        'rhel': {'ONBOOT': True, 'USERCTL': False, 'NM_CONTROLLED': False,
++        'rhel': {'ONBOOT': True, 'USERCTL': False,
+                  'BOOTPROTO': 'none'},
+         'suse': {'BOOTPROTO': 'static', 'STARTMODE': 'auto'},
+     }
+diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
+index 38d934d4..c67b5fcc 100644
+--- a/tests/unittests/test_net.py
++++ b/tests/unittests/test_net.py
+@@ -535,7 +535,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
+@@ -633,7 +632,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
+@@ -756,7 +754,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
+@@ -884,7 +881,6 @@ NETWORK_CONFIGS = {
+                 BOOTPROTO=none
+                 DEVICE=eth1
+                 HWADDR=cf:d6:af:48:e8:80
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no"""),
+@@ -901,7 +897,6 @@ NETWORK_CONFIGS = {
+                 IPADDR=192.168.21.3
+                 NETMASK=255.255.255.0
+                 METRIC=10000
+-                NM_CONTROLLED=no
+                 ONBOOT=yes
+                 TYPE=Ethernet
+                 USERCTL=no"""),
+@@ -1032,7 +1027,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
+@@ -1737,7 +1731,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"""),
+@@ -1745,7 +1738,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
+@@ -1763,7 +1755,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
+@@ -1773,7 +1764,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"""),
+@@ -1790,7 +1780,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
+@@ -1800,7 +1789,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
+@@ -1810,7 +1798,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
+@@ -1820,7 +1807,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"""),
+@@ -1829,7 +1815,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"""),
+@@ -1838,7 +1823,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"""),
+@@ -2294,7 +2278,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
+@@ -2304,7 +2287,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
+@@ -2326,7 +2308,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
+@@ -2383,7 +2364,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"""),
+@@ -2402,7 +2382,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
+@@ -2467,7 +2446,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
+@@ -2591,7 +2569,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
+@@ -2601,7 +2578,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
+@@ -2610,7 +2586,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
+@@ -3027,7 +3002,6 @@ class TestRhelSysConfigRendering(CiTestCase):
+ BOOTPROTO=dhcp
+ DEVICE=eth1000
+ HWADDR=07-1c-c6-75-a4-be
+-NM_CONTROLLED=no
+ ONBOOT=yes
+ TYPE=Ethernet
+ USERCTL=no
+@@ -3148,7 +3122,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
+@@ -3218,7 +3191,6 @@ USERCTL=no
+ #
+ BOOTPROTO=dhcp
+ DEVICE=eth0
+-NM_CONTROLLED=no
+ ONBOOT=yes
+ TYPE=Ethernet
+ USERCTL=no
+-- 
+2.27.0
+

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 6134624f10ef56534e37624adc12f11b09910591 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 e690c0fd..43a1490c 100644
+--- a/cloudinit/settings.py
++++ b/cloudinit/settings.py
+@@ -46,6 +46,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 3ef4491c..83e25dd1 100644
+--- a/cloudinit/stages.py
++++ b/cloudinit/stages.py
+@@ -147,6 +147,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, 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 de9a0f87..bb33ad45 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.27.0
+

SOURCES/0004-sysconfig-Don-t-write-BOOTPROTO-dhcp-for-ipv6-dhcp.patch

@@ -0,0 +1,36 @@
+From 699d37a6ff3e343e214943794aac09e4156c2b2b Mon Sep 17 00:00:00 2001
+From: Eduardo Otubo <otubo@redhat.com>
+Date: Fri, 7 May 2021 13:36:10 +0200
+Subject: sysconfig: Don't write BOOTPROTO=dhcp for ipv6 dhcp
+
+Don't write BOOTPROTO=dhcp for ipv6 dhcp, as BOOTPROTO applies
+only to ipv4. Explicitly write IPV6_AUTOCONF=no for dhcp on ipv6.
+
+X-downstream-only: yes
+
+Resolves: rhbz#1519271
+Signed-off-by: Ryan McCabe <rmccabe@redhat.com>
+
+Merged patches (19.4):
+- 6444df4 sysconfig: Don't disable IPV6_AUTOCONF
+
+Signed-off-by: Eduardo Otubo <otubo@redhat.com>
+---
+ tests/unittests/test_net.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
+index c67b5fcc..4ea0e597 100644
+--- a/tests/unittests/test_net.py
++++ b/tests/unittests/test_net.py
+@@ -1729,6 +1729,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+                 BOOTPROTO=none
+                 DEVICE=bond0
+                 DHCPV6C=yes
++                IPV6_AUTOCONF=no
+                 IPV6INIT=yes
+                 MACADDR=aa:bb:cc:dd:ee:ff
+                 ONBOOT=yes
+-- 
+2.27.0
+

SOURCES/0005-DataSourceAzure.py-use-hostnamectl-to-set-hostname.patch

@@ -0,0 +1,57 @@
+From ccc75c1be3ae08d813193071c798fc905b5c03e5 Mon Sep 17 00:00:00 2001
+From: Eduardo Otubo <otubo@redhat.com>
+Date: Fri, 7 May 2021 13:36:12 +0200
+Subject: DataSourceAzure.py: use hostnamectl to set hostname
+
+RH-Author: Vitaly Kuznetsov <vkuznets@redhat.com>
+Message-id: <20180417130754.12918-3-vkuznets@redhat.com>
+Patchwork-id: 79659
+O-Subject: [RHEL7.6/7.5.z cloud-init PATCH 2/2] DataSourceAzure.py: use hostnamectl to set hostname
+Bugzilla: 1568717
+RH-Acked-by: Eduardo Otubo <otubo@redhat.com>
+RH-Acked-by: Mohammed Gamal <mgamal@redhat.com>
+RH-Acked-by: Cathy Avery <cavery@redhat.com>
+
+The right way to set hostname in RHEL7 is:
+
+ $ hostnamectl set-hostname HOSTNAME
+
+DataSourceAzure, however, uses:
+ $ hostname HOSTSNAME
+
+instead and this causes problems. We can't simply change
+'BUILTIN_DS_CONFIG' in DataSourceAzure.py as 'hostname' is being used
+for both getting and setting the hostname.
+
+Long term, this should be fixed in a different way. Cloud-init
+has distro-specific hostname setting/getting (see
+cloudinit/distros/rhel.py) and DataSourceAzure.py needs to be switched
+to use these.
+
+Resolves: rhbz#1434109
+
+X-downstream-only: yes
+
+Signed-off-by: Eduardo Otubo <otubo@redhat.com>
+Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
+Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
+---
+ cloudinit/sources/DataSourceAzure.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cloudinit/sources/DataSourceAzure.py b/cloudinit/sources/DataSourceAzure.py
+index cee630f7..553b5a7e 100755
+--- a/cloudinit/sources/DataSourceAzure.py
++++ b/cloudinit/sources/DataSourceAzure.py
+@@ -296,7 +296,7 @@ def get_hostname(hostname_command='hostname'):
+ 
+ 
+ def set_hostname(hostname, hostname_command='hostname'):
+-    subp.subp([hostname_command, hostname])
++    util.subp(['hostnamectl', 'set-hostname', str(hostname)])
+ 
+ 
+ @azure_ds_telemetry_reporter
+-- 
+2.27.0
+

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

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

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

@@ -1,4 +1,4 @@
-From fea3e7fc6d23e988cf4a33dc03064ff31bf1d72d Mon Sep 17 00:00:00 2001
+From dfea0490b899804761fbd7aa23822783d7c36ec5 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,33 +21,45 @@ 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 +++++++---
+ tests/unittests/test_net.py |  1 -
- 2 files changed, 17 insertions(+), 4 deletions(-)
+ 2 files changed, 10 insertions(+), 2 deletions(-)
 
 diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
-index 3b7a1f93..f01c4236 100644
+index 3d276666..d5440998 100644
 --- a/cloudinit/net/sysconfig.py
 +++ b/cloudinit/net/sysconfig.py
-@@ -1029,7 +1029,16 @@ class Renderer(renderer.Renderer):
+@@ -925,7 +925,16 @@ class Renderer(renderer.Renderer):
          # Distros configuring /etc/sysconfig/network as a file e.g. Centos
-         if sysconfig_path.endswith("network"):
+         if sysconfig_path.endswith('network'):
              util.ensure_dir(os.path.dirname(sysconfig_path))
--            netcfg = [_make_header(), "NETWORKING=yes"]
+-            netcfg = [_make_header(), 'NETWORKING=yes']
 +            netcfg = []
-+            for line in util.load_file(sysconfig_path, quiet=True).split("\n"):
++            for line in util.load_file(sysconfig_path, quiet=True).split('\n'):
-+                if "cloud-init" in line:
++                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"])
++            netcfg.extend([_make_header(), 'NETWORKING=yes'])
              if network_state.use_ipv6:
-                 netcfg.append("NETWORKING_IPV6=yes")
+                 netcfg.append('NETWORKING_IPV6=yes')
-                 netcfg.append("IPV6_AUTOCONF=no")
+                 netcfg.append('IPV6_AUTOCONF=no')
+diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
+index 4ea0e597..c67b5fcc 100644
+--- a/tests/unittests/test_net.py
++++ b/tests/unittests/test_net.py
+@@ -1729,7 +1729,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+                 BOOTPROTO=none
+                 DEVICE=bond0
+                 DHCPV6C=yes
+-                IPV6_AUTOCONF=no
+                 IPV6INIT=yes
+                 MACADDR=aa:bb:cc:dd:ee:ff
+                 ONBOOT=yes
+-- 
+2.27.0
+

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

@@ -0,0 +1,148 @@
+From 24894dcf45a307f44e29dc5d5b2d864b75fd982c 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.27.0
+

SOURCES/0008-net-exclude-OVS-internal-interfaces-in-get_interface.patch

@@ -0,0 +1,496 @@
+From b48dda73da94782d7ab0c455fa382d3a5ef3c419 Mon Sep 17 00:00:00 2001
+From: Daniel Watkins <oddbloke@ubuntu.com>
+Date: Mon, 8 Mar 2021 12:50:57 -0500
+Subject: net: exclude OVS internal interfaces in get_interfaces (#829)
+
+`get_interfaces` is used to in two ways, broadly: firstly, to determine
+the available interfaces when converting cloud network configuration
+formats to cloud-init's network configuration formats; and, secondly, to
+ensure that any interfaces which are specified in network configuration
+are (a) available, and (b) named correctly.  The first of these is
+unaffected by this commit, as no clouds support Open vSwitch
+configuration in their network configuration formats.
+
+For the second, we check that MAC addresses of physical devices are
+unique.  In some OVS configurations, there are OVS-created devices which
+have duplicate MAC addresses, either with each other or with physical
+devices.  As these interfaces are created by OVS, we can be confident
+that (a) they will be available when appropriate, and (b) that OVS will
+name them correctly.  As such, this commit excludes any OVS-internal
+interfaces from the set of interfaces returned by `get_interfaces`.
+
+LP: #1912844
+---
+ cloudinit/net/__init__.py                     |  62 +++++++++
+ cloudinit/net/tests/test_init.py              | 119 ++++++++++++++++++
+ .../sources/helpers/tests/test_openstack.py   |   5 +
+ cloudinit/sources/tests/test_oracle.py        |   4 +
+ .../integration_tests/bugs/test_lp1912844.py  | 103 +++++++++++++++
+ .../test_datasource/test_configdrive.py       |   8 ++
+ tests/unittests/test_net.py                   |  20 +++
+ 7 files changed, 321 insertions(+)
+ create mode 100644 tests/integration_tests/bugs/test_lp1912844.py
+
+diff --git a/cloudinit/net/__init__.py b/cloudinit/net/__init__.py
+index de65e7af..385b7bcc 100644
+--- a/cloudinit/net/__init__.py
++++ b/cloudinit/net/__init__.py
+@@ -6,6 +6,7 @@
+ # This file is part of cloud-init. See LICENSE file for license information.
+ 
+ import errno
++import functools
+ import ipaddress
+ import logging
+ import os
+@@ -19,6 +20,19 @@ from cloudinit.url_helper import UrlError, readurl
+ LOG = logging.getLogger(__name__)
+ SYS_CLASS_NET = "/sys/class/net/"
+ DEFAULT_PRIMARY_INTERFACE = 'eth0'
++OVS_INTERNAL_INTERFACE_LOOKUP_CMD = [
++    "ovs-vsctl",
++    "--format",
++    "csv",
++    "--no-headings",
++    "--timeout",
++    "10",
++    "--columns",
++    "name",
++    "find",
++    "interface",
++    "type=internal",
++]
+ 
+ 
+ def natural_sort_key(s, _nsre=re.compile('([0-9]+)')):
+@@ -133,6 +147,52 @@ def master_is_openvswitch(devname):
+     return os.path.exists(ovs_path)
+ 
+ 
++@functools.lru_cache(maxsize=None)
++def openvswitch_is_installed() -> bool:
++    """Return a bool indicating if Open vSwitch is installed in the system."""
++    ret = bool(subp.which("ovs-vsctl"))
++    if not ret:
++        LOG.debug(
++            "ovs-vsctl not in PATH; not detecting Open vSwitch interfaces"
++        )
++    return ret
++
++
++@functools.lru_cache(maxsize=None)
++def get_ovs_internal_interfaces() -> list:
++    """Return a list of the names of OVS internal interfaces on the system.
++
++    These will all be strings, and are used to exclude OVS-specific interface
++    from cloud-init's network configuration handling.
++    """
++    try:
++        out, _err = subp.subp(OVS_INTERNAL_INTERFACE_LOOKUP_CMD)
++    except subp.ProcessExecutionError as exc:
++        if "database connection failed" in exc.stderr:
++            LOG.info(
++                "Open vSwitch is not yet up; no interfaces will be detected as"
++                " OVS-internal"
++            )
++            return []
++        raise
++    else:
++        return out.splitlines()
++
++
++def is_openvswitch_internal_interface(devname: str) -> bool:
++    """Returns True if this is an OVS internal interface.
++
++    If OVS is not installed or not yet running, this will return False.
++    """
++    if not openvswitch_is_installed():
++        return False
++    ovs_bridges = get_ovs_internal_interfaces()
++    if devname in ovs_bridges:
++        LOG.debug("Detected %s as an OVS interface", devname)
++        return True
++    return False
++
++
+ def is_netfailover(devname, driver=None):
+     """ netfailover driver uses 3 nics, master, primary and standby.
+         this returns True if the device is either the primary or standby
+@@ -884,6 +944,8 @@ def get_interfaces(blacklist_drivers=None) -> list:
+         # skip nics that have no mac (00:00....)
+         if name != 'lo' and mac == zero_mac[:len(mac)]:
+             continue
++        if is_openvswitch_internal_interface(name):
++            continue
+         # skip nics that have drivers blacklisted
+         driver = device_driver(name)
+         if driver in blacklist_drivers:
+diff --git a/cloudinit/net/tests/test_init.py b/cloudinit/net/tests/test_init.py
+index 0535387a..946f8ee2 100644
+--- a/cloudinit/net/tests/test_init.py
++++ b/cloudinit/net/tests/test_init.py
+@@ -391,6 +391,10 @@ class TestGetDeviceList(CiTestCase):
+         self.assertCountEqual(['eth0', 'eth1'], net.get_devicelist())
+ 
+ 
++@mock.patch(
++    "cloudinit.net.is_openvswitch_internal_interface",
++    mock.Mock(return_value=False),
++)
+ class TestGetInterfaceMAC(CiTestCase):
+ 
+     def setUp(self):
+@@ -1224,6 +1228,121 @@ class TestNetFailOver(CiTestCase):
+         self.assertFalse(net.is_netfailover(devname, driver))
+ 
+ 
++class TestOpenvswitchIsInstalled:
++    """Test cloudinit.net.openvswitch_is_installed.
++
++    Uses the ``clear_lru_cache`` local autouse fixture to allow us to test
++    despite the ``lru_cache`` decorator on the unit under test.
++    """
++
++    @pytest.fixture(autouse=True)
++    def clear_lru_cache(self):
++        net.openvswitch_is_installed.cache_clear()
++
++    @pytest.mark.parametrize(
++        "expected,which_return", [(True, "/some/path"), (False, None)]
++    )
++    @mock.patch("cloudinit.net.subp.which")
++    def test_mirrors_which_result(self, m_which, expected, which_return):
++        m_which.return_value = which_return
++        assert expected == net.openvswitch_is_installed()
++
++    @mock.patch("cloudinit.net.subp.which")
++    def test_only_calls_which_once(self, m_which):
++        net.openvswitch_is_installed()
++        net.openvswitch_is_installed()
++        assert 1 == m_which.call_count
++
++
++@mock.patch("cloudinit.net.subp.subp", return_value=("", ""))
++class TestGetOVSInternalInterfaces:
++    """Test cloudinit.net.get_ovs_internal_interfaces.
++
++    Uses the ``clear_lru_cache`` local autouse fixture to allow us to test
++    despite the ``lru_cache`` decorator on the unit under test.
++    """
++    @pytest.fixture(autouse=True)
++    def clear_lru_cache(self):
++        net.get_ovs_internal_interfaces.cache_clear()
++
++    def test_command_used(self, m_subp):
++        """Test we use the correct command when we call subp"""
++        net.get_ovs_internal_interfaces()
++
++        assert [
++            mock.call(net.OVS_INTERNAL_INTERFACE_LOOKUP_CMD)
++        ] == m_subp.call_args_list
++
++    def test_subp_contents_split_and_returned(self, m_subp):
++        """Test that the command output is appropriately mangled."""
++        stdout = "iface1\niface2\niface3\n"
++        m_subp.return_value = (stdout, "")
++
++        assert [
++            "iface1",
++            "iface2",
++            "iface3",
++        ] == net.get_ovs_internal_interfaces()
++
++    def test_database_connection_error_handled_gracefully(self, m_subp):
++        """Test that the error indicating OVS is down is handled gracefully."""
++        m_subp.side_effect = ProcessExecutionError(
++            stderr="database connection failed"
++        )
++
++        assert [] == net.get_ovs_internal_interfaces()
++
++    def test_other_errors_raised(self, m_subp):
++        """Test that only database connection errors are handled."""
++        m_subp.side_effect = ProcessExecutionError()
++
++        with pytest.raises(ProcessExecutionError):
++            net.get_ovs_internal_interfaces()
++
++    def test_only_runs_once(self, m_subp):
++        """Test that we cache the value."""
++        net.get_ovs_internal_interfaces()
++        net.get_ovs_internal_interfaces()
++
++        assert 1 == m_subp.call_count
++
++
++@mock.patch("cloudinit.net.get_ovs_internal_interfaces")
++@mock.patch("cloudinit.net.openvswitch_is_installed")
++class TestIsOpenVSwitchInternalInterface:
++    def test_false_if_ovs_not_installed(
++        self, m_openvswitch_is_installed, _m_get_ovs_internal_interfaces
++    ):
++        """Test that OVS' absence returns False."""
++        m_openvswitch_is_installed.return_value = False
++
++        assert not net.is_openvswitch_internal_interface("devname")
++
++    @pytest.mark.parametrize(
++        "detected_interfaces,devname,expected_return",
++        [
++            ([], "devname", False),
++            (["notdevname"], "devname", False),
++            (["devname"], "devname", True),
++            (["some", "other", "devices", "and", "ours"], "ours", True),
++        ],
++    )
++    def test_return_value_based_on_detected_interfaces(
++        self,
++        m_openvswitch_is_installed,
++        m_get_ovs_internal_interfaces,
++        detected_interfaces,
++        devname,
++        expected_return,
++    ):
++        """Test that the detected interfaces are used correctly."""
++        m_openvswitch_is_installed.return_value = True
++        m_get_ovs_internal_interfaces.return_value = detected_interfaces
++        assert expected_return == net.is_openvswitch_internal_interface(
++            devname
++        )
++
++
+ class TestIsIpAddress:
+     """Tests for net.is_ip_address.
+ 
+diff --git a/cloudinit/sources/helpers/tests/test_openstack.py b/cloudinit/sources/helpers/tests/test_openstack.py
+index 2bde1e3f..95fb9743 100644
+--- a/cloudinit/sources/helpers/tests/test_openstack.py
++++ b/cloudinit/sources/helpers/tests/test_openstack.py
+@@ -1,10 +1,15 @@
+ # This file is part of cloud-init. See LICENSE file for license information.
+ # ./cloudinit/sources/helpers/tests/test_openstack.py
++from unittest import mock
+ 
+ from cloudinit.sources.helpers import openstack
+ from cloudinit.tests import helpers as test_helpers
+ 
+ 
++@mock.patch(
++    "cloudinit.net.is_openvswitch_internal_interface",
++    mock.Mock(return_value=False)
++)
+ class TestConvertNetJson(test_helpers.CiTestCase):
+ 
+     def test_phy_types(self):
+diff --git a/cloudinit/sources/tests/test_oracle.py b/cloudinit/sources/tests/test_oracle.py
+index a7bbdfd9..dcf33b9b 100644
+--- a/cloudinit/sources/tests/test_oracle.py
++++ b/cloudinit/sources/tests/test_oracle.py
+@@ -173,6 +173,10 @@ class TestIsPlatformViable(test_helpers.CiTestCase):
+         m_read_dmi_data.assert_has_calls([mock.call('chassis-asset-tag')])
+ 
+ 
++@mock.patch(
++    "cloudinit.net.is_openvswitch_internal_interface",
++    mock.Mock(return_value=False)
++)
+ class TestNetworkConfigFromOpcImds:
+     def test_no_secondary_nics_does_not_mutate_input(self, oracle_ds):
+         oracle_ds._vnics_data = [{}]
+diff --git a/tests/integration_tests/bugs/test_lp1912844.py b/tests/integration_tests/bugs/test_lp1912844.py
+new file mode 100644
+index 00000000..efafae50
+--- /dev/null
++++ b/tests/integration_tests/bugs/test_lp1912844.py
+@@ -0,0 +1,103 @@
++"""Integration test for LP: #1912844
++
++cloud-init should ignore OVS-internal interfaces when performing its own
++interface determination: these interfaces are handled fully by OVS, so
++cloud-init should never need to touch them.
++
++This test is a semi-synthetic reproducer for the bug.  It uses a similar
++network configuration, tweaked slightly to DHCP in a way that will succeed even
++on "failed" boots.  The exact bug doesn't reproduce with the NoCloud
++datasource, because it runs at init-local time (whereas the MAAS datasource,
++from the report, runs only at init (network) time): this means that the
++networking code runs before OVS creates its interfaces (which happens after
++init-local but, of course, before networking is up), and so doesn't generate
++the traceback that they cause.  We work around this by calling
++``get_interfaces_by_mac` directly in the test code.
++"""
++import pytest
++
++from tests.integration_tests import random_mac_address
++
++MAC_ADDRESS = random_mac_address()
++
++NETWORK_CONFIG = """\
++bonds:
++    bond0:
++        interfaces:
++            - enp5s0
++        macaddress: {0}
++        mtu: 1500
++bridges:
++        ovs-br:
++            interfaces:
++            - bond0
++            macaddress: {0}
++            mtu: 1500
++            openvswitch: {{}}
++            dhcp4: true
++ethernets:
++    enp5s0:
++      mtu: 1500
++      set-name: enp5s0
++      match:
++          macaddress: {0}
++version: 2
++vlans:
++  ovs-br.100:
++    id: 100
++    link: ovs-br
++    mtu: 1500
++  ovs-br.200:
++    id: 200
++    link: ovs-br
++    mtu: 1500
++""".format(MAC_ADDRESS)
++
++
++SETUP_USER_DATA = """\
++#cloud-config
++packages:
++- openvswitch-switch
++"""
++
++
++@pytest.fixture
++def ovs_enabled_session_cloud(session_cloud):
++    """A session_cloud wrapper, to use an OVS-enabled image for tests.
++
++    This implementation is complicated by wanting to use ``session_cloud``s
++    snapshot cleanup/retention logic, to avoid having to reimplement that here.
++    """
++    old_snapshot_id = session_cloud.snapshot_id
++    with session_cloud.launch(
++        user_data=SETUP_USER_DATA,
++    ) as instance:
++        instance.instance.clean()
++        session_cloud.snapshot_id = instance.snapshot()
++
++    yield session_cloud
++
++    try:
++        session_cloud.delete_snapshot()
++    finally:
++        session_cloud.snapshot_id = old_snapshot_id
++
++
++@pytest.mark.lxd_vm
++def test_get_interfaces_by_mac_doesnt_traceback(ovs_enabled_session_cloud):
++    """Launch our OVS-enabled image and confirm the bug doesn't reproduce."""
++    launch_kwargs = {
++        "config_dict": {
++            "user.network-config": NETWORK_CONFIG,
++            "volatile.eth0.hwaddr": MAC_ADDRESS,
++        },
++    }
++    with ovs_enabled_session_cloud.launch(
++        launch_kwargs=launch_kwargs,
++    ) as client:
++        result = client.execute(
++            "python3 -c"
++            "'from cloudinit.net import get_interfaces_by_mac;"
++            "get_interfaces_by_mac()'"
++        )
++        assert result.ok
+diff --git a/tests/unittests/test_datasource/test_configdrive.py b/tests/unittests/test_datasource/test_configdrive.py
+index 6f830cc6..2e2b7847 100644
+--- a/tests/unittests/test_datasource/test_configdrive.py
++++ b/tests/unittests/test_datasource/test_configdrive.py
+@@ -494,6 +494,10 @@ class TestConfigDriveDataSource(CiTestCase):
+         self.assertEqual('config-disk (/dev/anything)', cfg_ds.subplatform)
+ 
+ 
++@mock.patch(
++    "cloudinit.net.is_openvswitch_internal_interface",
++    mock.Mock(return_value=False)
++)
+ class TestNetJson(CiTestCase):
+     def setUp(self):
+         super(TestNetJson, self).setUp()
+@@ -654,6 +658,10 @@ class TestNetJson(CiTestCase):
+             self.assertEqual(out_data, conv_data)
+ 
+ 
++@mock.patch(
++    "cloudinit.net.is_openvswitch_internal_interface",
++    mock.Mock(return_value=False)
++)
+ class TestConvertNetworkData(CiTestCase):
+ 
+     with_logs = True
+diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
+index c67b5fcc..14d3462f 100644
+--- a/tests/unittests/test_net.py
++++ b/tests/unittests/test_net.py
+@@ -2908,6 +2908,10 @@ iface eth1 inet dhcp
+         self.assertEqual(0, mock_settle.call_count)
+ 
+ 
++@mock.patch(
++    "cloudinit.net.is_openvswitch_internal_interface",
++    mock.Mock(return_value=False)
++)
+ class TestRhelSysConfigRendering(CiTestCase):
+ 
+     with_logs = True
+@@ -3592,6 +3596,10 @@ USERCTL=no
+                 expected, self._render_and_read(network_config=v2data))
+ 
+ 
++@mock.patch(
++    "cloudinit.net.is_openvswitch_internal_interface",
++    mock.Mock(return_value=False)
++)
+ class TestOpenSuseSysConfigRendering(CiTestCase):
+ 
+     with_logs = True
+@@ -5009,6 +5017,10 @@ class TestNetRenderers(CiTestCase):
+             self.assertTrue(result)
+ 
+ 
++@mock.patch(
++    "cloudinit.net.is_openvswitch_internal_interface",
++    mock.Mock(return_value=False)
++)
+ class TestGetInterfaces(CiTestCase):
+     _data = {'bonds': ['bond1'],
+              'bridges': ['bridge1'],
+@@ -5158,6 +5170,10 @@ class TestInterfaceHasOwnMac(CiTestCase):
+         self.assertFalse(interface_has_own_mac("eth0"))
+ 
+ 
++@mock.patch(
++    "cloudinit.net.is_openvswitch_internal_interface",
++    mock.Mock(return_value=False)
++)
+ class TestGetInterfacesByMac(CiTestCase):
+     _data = {'bonds': ['bond1'],
+              'bridges': ['bridge1'],
+@@ -5314,6 +5330,10 @@ class TestInterfacesSorting(CiTestCase):
+             ['enp0s3', 'enp0s8', 'enp0s13', 'enp1s2', 'enp2s0', 'enp2s3'])
+ 
+ 
++@mock.patch(
++    "cloudinit.net.is_openvswitch_internal_interface",
++    mock.Mock(return_value=False)
++)
+ class TestGetIBHwaddrsByInterface(CiTestCase):
+ 
+     _ib_addr = '80:00:00:28:fe:80:00:00:00:00:00:00:00:11:22:03:00:33:44:56'
+-- 
+2.27.0
+

SOURCES/0009-Fix-requiring-device-number-on-EC2-derivatives-836.patch

@@ -0,0 +1,87 @@
+From bec5fb60ffae3d1137c7261e5571c2751c5dda25 Mon Sep 17 00:00:00 2001
+From: James Falcon <TheRealFalcon@users.noreply.github.com>
+Date: Mon, 8 Mar 2021 14:09:47 -0600
+Subject: Fix requiring device-number on EC2 derivatives (#836)
+
+#342 (70dbccbb) introduced the ability to determine route-metrics based on
+the `device-number` provided by the EC2 IMDS. Not all datasources that
+subclass EC2 will have this attribute, so allow the old behavior if
+`device-number` is not present.
+
+LP: #1917875
+---
+ cloudinit/sources/DataSourceEc2.py            |  3 +-
+ .../unittests/test_datasource/test_aliyun.py  | 30 +++++++++++++++++++
+ 2 files changed, 32 insertions(+), 1 deletion(-)
+
+diff --git a/cloudinit/sources/DataSourceEc2.py b/cloudinit/sources/DataSourceEc2.py
+index 1930a509..a2105dc7 100644
+--- a/cloudinit/sources/DataSourceEc2.py
++++ b/cloudinit/sources/DataSourceEc2.py
+@@ -765,13 +765,14 @@ def convert_ec2_metadata_network_config(
+         netcfg['ethernets'][nic_name] = dev_config
+         return netcfg
+     # Apply network config for all nics and any secondary IPv4/v6 addresses
++    nic_idx = 0
+     for mac, nic_name in sorted(macs_to_nics.items()):
+         nic_metadata = macs_metadata.get(mac)
+         if not nic_metadata:
+             continue  # Not a physical nic represented in metadata
+         # device-number is zero-indexed, we want it 1-indexed for the
+         # multiplication on the following line
+-        nic_idx = int(nic_metadata['device-number']) + 1
++        nic_idx = int(nic_metadata.get('device-number', nic_idx)) + 1
+         dhcp_override = {'route-metric': nic_idx * 100}
+         dev_config = {'dhcp4': True, 'dhcp4-overrides': dhcp_override,
+                       'dhcp6': False,
+diff --git a/tests/unittests/test_datasource/test_aliyun.py b/tests/unittests/test_datasource/test_aliyun.py
+index eb2828d5..cab1ac2b 100644
+--- a/tests/unittests/test_datasource/test_aliyun.py
++++ b/tests/unittests/test_datasource/test_aliyun.py
+@@ -7,6 +7,7 @@ from unittest import mock
+ 
+ from cloudinit import helpers
+ from cloudinit.sources import DataSourceAliYun as ay
++from cloudinit.sources.DataSourceEc2 import convert_ec2_metadata_network_config
+ from cloudinit.tests import helpers as test_helpers
+ 
+ DEFAULT_METADATA = {
+@@ -183,6 +184,35 @@ class TestAliYunDatasource(test_helpers.HttprettyTestCase):
+         self.assertEqual(ay.parse_public_keys(public_keys),
+                          public_keys['key-pair-0']['openssh-key'])
+ 
++    def test_route_metric_calculated_without_device_number(self):
++        """Test that route-metric code works without `device-number`
++
++        `device-number` is part of EC2 metadata, but not supported on aliyun.
++        Attempting to access it will raise a KeyError.
++
++        LP: #1917875
++        """
++        netcfg = convert_ec2_metadata_network_config(
++            {"interfaces": {"macs": {
++                "06:17:04:d7:26:09": {
++                    "interface-id": "eni-e44ef49e",
++                },
++                "06:17:04:d7:26:08": {
++                    "interface-id": "eni-e44ef49f",
++                }
++            }}},
++            macs_to_nics={
++                '06:17:04:d7:26:09': 'eth0',
++                '06:17:04:d7:26:08': 'eth1',
++            }
++        )
++
++        met0 = netcfg['ethernets']['eth0']['dhcp4-overrides']['route-metric']
++        met1 = netcfg['ethernets']['eth1']['dhcp4-overrides']['route-metric']
++
++        # route-metric numbers should be 100 apart
++        assert 100 == abs(met0 - met1)
++
+ 
+ class TestIsAliYun(test_helpers.CiTestCase):
+     ALIYUN_PRODUCT = 'Alibaba Cloud ECS'
+-- 
+2.27.0
+

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

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

SOURCES/ci-Change-netifaces-dependency-to-0.10.4-965.patch

@@ -0,0 +1,47 @@
+From 67d62f2c0df1fcb5cd86be73cba6064075aa61e3 Mon Sep 17 00:00:00 2001
+From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+Date: Fri, 14 Jan 2022 16:39:46 +0100
+Subject: [PATCH 3/6] Change netifaces dependency to 0.10.4 (#965)
+
+RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-MergeRequest: 43: Datasource for VMware
+RH-Commit: [3/6] 81f0638e62841bab09b423d9cb5d340026ee87c2
+RH-Bugzilla: 2040704
+RH-Acked-by: Mohamed Gamal Morsy <mmorsy@redhat.com>
+RH-Acked-by: Eduardo Otubo <otubo@redhat.com>
+
+commit b9d308b4d61d22bacc05bcae59819755975631f8
+Author: Andrew Kutz <101085+akutz@users.noreply.github.com>
+Date:   Tue Aug 10 15:10:44 2021 -0500
+
+    Change netifaces dependency to 0.10.4 (#965)
+
+    Change netifaces dependency to 0.10.4
+
+    Currently versions Ubuntu <=20.10 use netifaces 0.10.4 By requiring
+    netifaces 0.10.9, the VMware datasource omitted itself from cloud-init
+    on Ubuntu <=20.10.
+
+    This patch changes the netifaces dependency to 0.10.4. While it is true
+    there are patches to netifaces post 0.10.4 that are desirable, testing
+    against the most common network configuration was performed to verify
+    the VMware datasource will still function with netifaces 0.10.4.
+
+Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+---
+ requirements.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/requirements.txt b/requirements.txt
+index 41d01d62..c4adc455 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -40,4 +40,4 @@ jsonschema
+ # and still participate in instance-data by gathering the network in detail at
+ # runtime and merge that information into the metadata and repersist that to
+ # disk.
+-netifaces>=0.10.9
++netifaces>=0.10.4
+-- 
+2.27.0
+

SOURCES/ci-Fix-IPv6-netmask-format-for-sysconfig-1215.patch

@@ -0,0 +1,484 @@
+From e38ff212eb35943961b79f0d30cdceffc1bc0905 Mon Sep 17 00:00:00 2001
+From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+Date: Wed, 2 Mar 2022 10:18:02 +0100
+Subject: [PATCH] Fix IPv6 netmask format for sysconfig (#1215)
+
+RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-MergeRequest: 49: Fix IPv6 netmask format for sysconfig (#1215)
+RH-Commit: [1/1] 7a97580791fc03f6ae878a699cf92f620f58a237
+RH-Bugzilla: 2060026
+RH-Acked-by: Eduardo Otubo <otubo@redhat.com>
+RH-Acked-by: Mohamed Gamal Morsy <mmorsy@redhat.com>
+
+commit b97a30f0a05c1dea918c46ca9c05c869d15fe2d5
+Author: Harald <hjensas@redhat.com>
+Date:   Tue Feb 8 15:49:00 2022 +0100
+
+    Fix IPv6 netmask format for sysconfig (#1215)
+
+    This change converts the IPv6 netmask from the network_data.json[1]
+    format to the CIDR style, <IPv6_addr>/<prefix>.
+
+    Using an IPv6 address like ffff:ffff:ffff:ffff:: does not work with
+    NetworkManager, nor networkscripts.
+
+    NetworkManager will ignore the route, logging:
+      ifcfg-rh: ignoring invalid route at \
+        "::/:: via fd00:fd00:fd00:2::fffe dev $DEV" \
+        (/etc/sysconfig/network-scripts/route6-$DEV:3): \
+        Argument for "::/::" is not ADDR/PREFIX format
+
+    Similarly if using networkscripts, ip route fail with error:
+      Error: inet6 prefix is expected rather than \
+        "fd00:fd00:fd00::/ffff:ffff:ffff:ffff::".
+
+    Also a bit of refactoring ...
+
+    cloudinit.net.sysconfig.Route.to_string:
+    * Move a couple of lines around to reduce repeated code.
+    * if "ADDRESS" not in key -> continute, so that the
+      code block following it can be de-indented.
+    cloudinit.net.network_state:
+    * Refactors the ipv4_mask_to_net_prefix, ipv6_mask_to_net_prefix
+      removes mask_to_net_prefix methods. Utilize ipaddress library to
+      do some of the heavy lifting.
+
+    LP: #1959148
+
+Conflicts (most related to different format style):
+        cloudinit/net/__init__.py
+        cloudinit/net/network_state.py
+        cloudinit/net/sysconfig.py
+        cloudinit/sources/DataSourceOpenNebula.py
+        cloudinit/sources/helpers/vmware/imc/config_nic.py
+        tests/unittests/net/test_init.py (file not backported)
+        tests/unittests/net/test_network_state.py (file not backported)
+        tests/unittests/test_net.py
+
+Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+---
+ cloudinit/net/__init__.py                     |   7 +-
+ cloudinit/net/network_state.py                | 103 +++++++-----------
+ cloudinit/net/sysconfig.py                    |  91 ++++++++++------
+ cloudinit/sources/DataSourceOpenNebula.py     |   2 +-
+ .../sources/helpers/vmware/imc/config_nic.py  |   4 +-
+ tests/unittests/test_net.py                   |  78 ++++++++++++-
+ 6 files changed, 176 insertions(+), 109 deletions(-)
+
+diff --git a/cloudinit/net/__init__.py b/cloudinit/net/__init__.py
+index 003efa2a..12bf64de 100644
+--- a/cloudinit/net/__init__.py
++++ b/cloudinit/net/__init__.py
+@@ -14,7 +14,7 @@ import re
+ 
+ from cloudinit import subp
+ from cloudinit import util
+-from cloudinit.net.network_state import mask_to_net_prefix
++from cloudinit.net.network_state import ipv4_mask_to_net_prefix
+ from cloudinit.url_helper import UrlError, readurl
+ 
+ LOG = logging.getLogger(__name__)
+@@ -1048,10 +1048,11 @@ class EphemeralIPv4Network(object):
+                 'Cannot init network on {0} with {1}/{2} and bcast {3}'.format(
+                     interface, ip, prefix_or_mask, broadcast))
+         try:
+-            self.prefix = mask_to_net_prefix(prefix_or_mask)
++            self.prefix = ipv4_mask_to_net_prefix(prefix_or_mask)
+         except ValueError as e:
+             raise ValueError(
+-                'Cannot setup network: {0}'.format(e)
++                "Cannot setup network, invalid prefix or "
++                "netmask: {0}".format(e)
+             ) from e
+ 
+         self.connectivity_url = connectivity_url
+diff --git a/cloudinit/net/network_state.py b/cloudinit/net/network_state.py
+index e8bf9e39..2768ef94 100644
+--- a/cloudinit/net/network_state.py
++++ b/cloudinit/net/network_state.py
+@@ -6,6 +6,7 @@
+ 
+ import copy
+ import functools
++import ipaddress
+ import logging
+ import socket
+ import struct
+@@ -872,12 +873,18 @@ def _normalize_net_keys(network, address_keys=()):
+         try:
+             prefix = int(maybe_prefix)
+         except ValueError:
+-            # this supports input of <address>/255.255.255.0
+-            prefix = mask_to_net_prefix(maybe_prefix)
+-    elif netmask:
+-        prefix = mask_to_net_prefix(netmask)
+-    elif 'prefix' in net:
+-        prefix = int(net['prefix'])
++            if ipv6:
++                # this supports input of ffff:ffff:ffff::
++                prefix = ipv6_mask_to_net_prefix(maybe_prefix)
++            else:
++                # this supports input of 255.255.255.0
++                prefix = ipv4_mask_to_net_prefix(maybe_prefix)
++    elif netmask and not ipv6:
++        prefix = ipv4_mask_to_net_prefix(netmask)
++    elif netmask and ipv6:
++        prefix = ipv6_mask_to_net_prefix(netmask)
++    elif "prefix" in net:
++        prefix = int(net["prefix"])
+     else:
+         prefix = 64 if ipv6 else 24
+ 
+@@ -972,72 +979,42 @@ def ipv4_mask_to_net_prefix(mask):
+        str(24)         => 24
+        "24"            => 24
+     """
+-    if isinstance(mask, int):
+-        return mask
+-    if isinstance(mask, str):
+-        try:
+-            return int(mask)
+-        except ValueError:
+-            pass
+-    else:
+-        raise TypeError("mask '%s' is not a string or int")
+-
+-    if '.' not in mask:
+-        raise ValueError("netmask '%s' does not contain a '.'" % mask)
+-
+-    toks = mask.split(".")
+-    if len(toks) != 4:
+-        raise ValueError("netmask '%s' had only %d parts" % (mask, len(toks)))
+-
+-    return sum([bin(int(x)).count('1') for x in toks])
++    return ipaddress.ip_network(f"0.0.0.0/{mask}").prefixlen
+ 
+ 
+ def ipv6_mask_to_net_prefix(mask):
+     """Convert an ipv6 netmask (very uncommon) or prefix (64) to prefix.
+ 
+-    If 'mask' is an integer or string representation of one then
+-    int(mask) will be returned.
++    If the input is already an integer or a string representation of
++    an integer, then int(mask) will be returned.
++       "ffff:ffff:ffff::"  => 48
++       "48"                => 48
+     """
+-
+-    if isinstance(mask, int):
+-        return mask
+-    if isinstance(mask, str):
+-        try:
+-            return int(mask)
+-        except ValueError:
+-            pass
+-    else:
+-        raise TypeError("mask '%s' is not a string or int")
+-
+-    if ':' not in mask:
+-        raise ValueError("mask '%s' does not have a ':'")
+-
+-    bitCount = [0, 0x8000, 0xc000, 0xe000, 0xf000, 0xf800, 0xfc00, 0xfe00,
+-                0xff00, 0xff80, 0xffc0, 0xffe0, 0xfff0, 0xfff8, 0xfffc,
+-                0xfffe, 0xffff]
+-    prefix = 0
+-    for word in mask.split(':'):
+-        if not word or int(word, 16) == 0:
+-            break
+-        prefix += bitCount.index(int(word, 16))
+-
+-    return prefix
+-
+-
+-def mask_to_net_prefix(mask):
+-    """Return the network prefix for the netmask provided.
+-
+-    Supports ipv4 or ipv6 netmasks."""
+     try:
+-        # if 'mask' is a prefix that is an integer.
+-        # then just return it.
+-        return int(mask)
++        # In the case the mask is already a prefix
++        prefixlen = ipaddress.ip_network(f"::/{mask}").prefixlen
++        return prefixlen
+     except ValueError:
++        # ValueError means mask is an IPv6 address representation and need
++        # conversion.
+         pass
+-    if is_ipv6_addr(mask):
+-        return ipv6_mask_to_net_prefix(mask)
+-    else:
+-        return ipv4_mask_to_net_prefix(mask)
++
++    netmask = ipaddress.ip_address(mask)
++    mask_int = int(netmask)
++    # If the mask is all zeroes, just return it
++    if mask_int == 0:
++        return mask_int
++
++    trailing_zeroes = min(
++        ipaddress.IPV6LENGTH, (~mask_int & (mask_int - 1)).bit_length()
++    )
++    leading_ones = mask_int >> trailing_zeroes
++    prefixlen = ipaddress.IPV6LENGTH - trailing_zeroes
++    all_ones = (1 << prefixlen) - 1
++    if leading_ones != all_ones:
++        raise ValueError("Invalid network mask '%s'" % mask)
++
++    return prefixlen
+ 
+ 
+ def mask_and_ipv4_to_bcast_addr(mask, ip):
+diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
+index d5440998..7ecbe1c3 100644
+--- a/cloudinit/net/sysconfig.py
++++ b/cloudinit/net/sysconfig.py
+@@ -12,6 +12,7 @@ from cloudinit import util
+ from cloudinit import subp
+ from cloudinit.distros.parsers import networkmanager_conf
+ from cloudinit.distros.parsers import resolv_conf
++from cloudinit.net import network_state
+ 
+ from . import renderer
+ from .network_state import (
+@@ -171,43 +172,61 @@ class Route(ConfigMap):
+         # (because Route can contain a mix of IPv4 and IPv6)
+         reindex = -1
+         for key in sorted(self._conf.keys()):
+-            if 'ADDRESS' in key:
+-                index = key.replace('ADDRESS', '')
+-                address_value = str(self._conf[key])
+-                # only accept combinations:
+-                # if proto ipv6 only display ipv6 routes
+-                # if proto ipv4 only display ipv4 routes
+-                # do not add ipv6 routes if proto is ipv4
+-                # do not add ipv4 routes if proto is ipv6
+-                # (this array will contain a mix of ipv4 and ipv6)
+-                if proto == "ipv4" and not self.is_ipv6_route(address_value):
+-                    netmask_value = str(self._conf['NETMASK' + index])
+-                    gateway_value = str(self._conf['GATEWAY' + index])
+-                    # increase IPv4 index
+-                    reindex = reindex + 1
+-                    buf.write("%s=%s\n" % ('ADDRESS' + str(reindex),
+-                                           _quote_value(address_value)))
+-                    buf.write("%s=%s\n" % ('GATEWAY' + str(reindex),
+-                                           _quote_value(gateway_value)))
+-                    buf.write("%s=%s\n" % ('NETMASK' + str(reindex),
+-                                           _quote_value(netmask_value)))
+-                    metric_key = 'METRIC' + index
+-                    if metric_key in self._conf:
+-                        metric_value = str(self._conf['METRIC' + index])
+-                        buf.write("%s=%s\n" % ('METRIC' + str(reindex),
+-                                               _quote_value(metric_value)))
+-                elif proto == "ipv6" and self.is_ipv6_route(address_value):
+-                    netmask_value = str(self._conf['NETMASK' + index])
+-                    gateway_value = str(self._conf['GATEWAY' + index])
+-                    metric_value = (
+-                        'metric ' + str(self._conf['METRIC' + index])
+-                        if 'METRIC' + index in self._conf else '')
++            if "ADDRESS" not in key:
++                continue
++
++            index = key.replace("ADDRESS", "")
++            address_value = str(self._conf[key])
++            netmask_value = str(self._conf["NETMASK" + index])
++            gateway_value = str(self._conf["GATEWAY" + index])
++
++            # only accept combinations:
++            # if proto ipv6 only display ipv6 routes
++            # if proto ipv4 only display ipv4 routes
++            # do not add ipv6 routes if proto is ipv4
++            # do not add ipv4 routes if proto is ipv6
++            # (this array will contain a mix of ipv4 and ipv6)
++            if proto == "ipv4" and not self.is_ipv6_route(address_value):
++                # increase IPv4 index
++                reindex = reindex + 1
++                buf.write(
++                    "%s=%s\n"
++                    % ("ADDRESS" + str(reindex), _quote_value(address_value))
++                )
++                buf.write(
++                    "%s=%s\n"
++                    % ("GATEWAY" + str(reindex), _quote_value(gateway_value))
++                )
++                buf.write(
++                    "%s=%s\n"
++                    % ("NETMASK" + str(reindex), _quote_value(netmask_value))
++                )
++                metric_key = "METRIC" + index
++                if metric_key in self._conf:
++                    metric_value = str(self._conf["METRIC" + index])
+                     buf.write(
+-                        "%s/%s via %s %s dev %s\n" % (address_value,
+-                                                      netmask_value,
+-                                                      gateway_value,
+-                                                      metric_value,
+-                                                      self._route_name))
++                        "%s=%s\n"
++                        % ("METRIC" + str(reindex), _quote_value(metric_value))
++                    )
++            elif proto == "ipv6" and self.is_ipv6_route(address_value):
++                prefix_value = network_state.ipv6_mask_to_net_prefix(
++                    netmask_value
++                )
++                metric_value = (
++                    "metric " + str(self._conf["METRIC" + index])
++                    if "METRIC" + index in self._conf
++                    else ""
++                )
++                buf.write(
++                    "%s/%s via %s %s dev %s\n"
++                    % (
++                        address_value,
++                        prefix_value,
++                        gateway_value,
++                        metric_value,
++                        self._route_name,
++                    )
++                )
+ 
+         return buf.getvalue()
+ 
+diff --git a/cloudinit/sources/DataSourceOpenNebula.py b/cloudinit/sources/DataSourceOpenNebula.py
+index 730ec586..e7980ab1 100644
+--- a/cloudinit/sources/DataSourceOpenNebula.py
++++ b/cloudinit/sources/DataSourceOpenNebula.py
+@@ -233,7 +233,7 @@ class OpenNebulaNetwork(object):
+             # Set IPv4 address
+             devconf['addresses'] = []
+             mask = self.get_mask(c_dev)
+-            prefix = str(net.mask_to_net_prefix(mask))
++            prefix = str(net.ipv4_mask_to_net_prefix(mask))
+             devconf['addresses'].append(
+                 self.get_ip(c_dev, mac) + '/' + prefix)
+ 
+diff --git a/cloudinit/sources/helpers/vmware/imc/config_nic.py b/cloudinit/sources/helpers/vmware/imc/config_nic.py
+index 9cd2c0c0..3a45c67e 100644
+--- a/cloudinit/sources/helpers/vmware/imc/config_nic.py
++++ b/cloudinit/sources/helpers/vmware/imc/config_nic.py
+@@ -9,7 +9,7 @@ import logging
+ import os
+ import re
+ 
+-from cloudinit.net.network_state import mask_to_net_prefix
++from cloudinit.net.network_state import ipv4_mask_to_net_prefix
+ from cloudinit import subp
+ from cloudinit import util
+ 
+@@ -180,7 +180,7 @@ class NicConfigurator(object):
+         """
+         route_list = []
+ 
+-        cidr = mask_to_net_prefix(netmask)
++        cidr = ipv4_mask_to_net_prefix(netmask)
+ 
+         for gateway in gateways:
+             destination = "%s/%d" % (gen_subnet(gateway, netmask), cidr)
+diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
+index 14d3462f..a7f6a1f7 100644
+--- a/tests/unittests/test_net.py
++++ b/tests/unittests/test_net.py
+@@ -2025,10 +2025,10 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+                     routes:
+                         - gateway: 2001:67c:1562:1
+                           network: 2001:67c:1
+-                          netmask: ffff:ffff:0
++                          netmask: "ffff:ffff::"
+                         - gateway: 3001:67c:1562:1
+                           network: 3001:67c:1
+-                          netmask: ffff:ffff:0
++                          netmask: "ffff:ffff::"
+                           metric: 10000
+             """),
+         'expected_netplan': textwrap.dedent("""
+@@ -2295,8 +2295,8 @@ iface bond0 inet6 static
+             'route6-bond0': textwrap.dedent("""\
+         # Created by cloud-init on instance boot automatically, do not edit.
+         #
+-        2001:67c:1/ffff:ffff:0 via 2001:67c:1562:1  dev bond0
+-        3001:67c:1/ffff:ffff:0 via 3001:67c:1562:1 metric 10000 dev bond0
++        2001:67c:1/32 via 2001:67c:1562:1  dev bond0
++        3001:67c:1/32 via 3001:67c:1562:1 metric 10000 dev bond0
+             """),
+             'route-bond0': textwrap.dedent("""\
+         ADDRESS0=10.1.3.0
+@@ -3088,6 +3088,76 @@ USERCTL=no
+             renderer.render_network_state(ns, target=render_dir)
+         self.assertEqual([], os.listdir(render_dir))
+ 
++    def test_invalid_network_mask_ipv6(self):
++        net_json = {
++            "services": [{"type": "dns", "address": "172.19.0.12"}],
++            "networks": [
++                {
++                    "network_id": "public-ipv6",
++                    "type": "ipv6",
++                    "netmask": "",
++                    "link": "tap1a81968a-79",
++                    "routes": [
++                        {
++                            "gateway": "2001:DB8::1",
++                            "netmask": "ff:ff:ff:ff::",
++                            "network": "2001:DB8:1::1",
++                        },
++                    ],
++                    "ip_address": "2001:DB8::10",
++                    "id": "network1",
++                }
++            ],
++            "links": [
++                {
++                    "ethernet_mac_address": "fa:16:3e:ed:9a:59",
++                    "mtu": None,
++                    "type": "bridge",
++                    "id": "tap1a81968a-79",
++                    "vif_id": "1a81968a-797a-400f-8a80-567f997eb93f",
++                },
++            ],
++        }
++        macs = {"fa:16:3e:ed:9a:59": "eth0"}
++        network_cfg = openstack.convert_net_json(net_json, known_macs=macs)
++        with self.assertRaises(ValueError):
++            network_state.parse_net_config_data(network_cfg, skip_broken=False)
++
++    def test_invalid_network_mask_ipv4(self):
++        net_json = {
++            "services": [{"type": "dns", "address": "172.19.0.12"}],
++            "networks": [
++                {
++                    "network_id": "public-ipv4",
++                    "type": "ipv4",
++                    "netmask": "",
++                    "link": "tap1a81968a-79",
++                    "routes": [
++                        {
++                            "gateway": "172.20.0.1",
++                            "netmask": "255.234.255.0",
++                            "network": "172.19.0.0",
++                        },
++                    ],
++                    "ip_address": "172.20.0.10",
++                    "id": "network1",
++                }
++            ],
++            "links": [
++                {
++                    "ethernet_mac_address": "fa:16:3e:ed:9a:59",
++                    "mtu": None,
++                    "type": "bridge",
++                    "id": "tap1a81968a-79",
++                    "vif_id": "1a81968a-797a-400f-8a80-567f997eb93f",
++                },
++            ],
++        }
++        macs = {"fa:16:3e:ed:9a:59": "eth0"}
++        network_cfg = openstack.convert_net_json(net_json, known_macs=macs)
++        with self.assertRaises(ValueError):
++            network_state.parse_net_config_data(network_cfg, skip_broken=False)
++
+     def test_openstack_rendering_samples(self):
+         for os_sample in OS_SAMPLES:
+             render_dir = self.tmp_dir()
+-- 
+2.27.0
+

SOURCES/ci-Fix-home-permissions-modified-by-ssh-module-SC-338-9.patch

@@ -0,0 +1,262 @@
+From 71989367e7a634fdd2af8ef58473975e0ef60464 Mon Sep 17 00:00:00 2001
+From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+Date: Sat, 21 Aug 2021 13:53:27 +0200
+Subject: [PATCH] Fix home permissions modified by ssh module (SC-338) (#984)
+
+RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-MergeRequest: 29: Fix home permissions modified by ssh module (SC-338) (#984)
+RH-Commit: [1/1] c409f2609b1d7e024eba77b55a196a4cafadd1d7 (eesposit/cloud-init)
+RH-Bugzilla: 1995840
+RH-Acked-by: Mohamed Gamal Morsy <mmorsy@redhat.com>
+RH-Acked-by: Eduardo Otubo <otubo@redhat.com>
+
+TESTED: By me and QA
+BREW: 39178090
+
+Fix home permissions modified by ssh module (SC-338) (#984)
+
+commit 7d3f5d750f6111c2716143364ea33486df67c927
+Author: James Falcon <therealfalcon@gmail.com>
+Date:   Fri Aug 20 17:09:49 2021 -0500
+
+    Fix home permissions modified by ssh module (SC-338) (#984)
+
+    Fix home permissions modified by ssh module
+
+    In #956, we updated the file and directory permissions for keys not in
+    the user's home directory. We also unintentionally modified the
+    permissions within the home directory as well. These should not change,
+    and this commit changes that back.
+
+    LP: #1940233
+
+Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+---
+ cloudinit/ssh_util.py                         |  35 ++++-
+ .../modules/test_ssh_keysfile.py              | 132 +++++++++++++++---
+ 2 files changed, 146 insertions(+), 21 deletions(-)
+
+diff --git a/cloudinit/ssh_util.py b/cloudinit/ssh_util.py
+index b8a3c8f7..9ccadf09 100644
+--- a/cloudinit/ssh_util.py
++++ b/cloudinit/ssh_util.py
+@@ -321,23 +321,48 @@ def check_create_path(username, filename, strictmodes):
+         home_folder = os.path.dirname(user_pwent.pw_dir)
+         for directory in directories:
+             parent_folder += "/" + directory
+-            if home_folder.startswith(parent_folder):
++
++            # security check, disallow symlinks in the AuthorizedKeysFile path.
++            if os.path.islink(parent_folder):
++                LOG.debug(
++                    "Invalid directory. Symlink exists in path: %s",
++                    parent_folder)
++                return False
++
++            if os.path.isfile(parent_folder):
++                LOG.debug(
++                    "Invalid directory. File exists in path: %s",
++                    parent_folder)
++                return False
++
++            if (home_folder.startswith(parent_folder) or
++                    parent_folder == user_pwent.pw_dir):
+                 continue
+ 
+-            if not os.path.isdir(parent_folder):
++            if not os.path.exists(parent_folder):
+                 # directory does not exist, and permission so far are good:
+                 # create the directory, and make it accessible by everyone
+                 # but owned by root, as it might be used by many users.
+                 with util.SeLinuxGuard(parent_folder):
+-                    os.makedirs(parent_folder, mode=0o755, exist_ok=True)
+-                    util.chownbyid(parent_folder, root_pwent.pw_uid,
+-                                   root_pwent.pw_gid)
++                    mode = 0o755
++                    uid = root_pwent.pw_uid
++                    gid = root_pwent.pw_gid
++                    if parent_folder.startswith(user_pwent.pw_dir):
++                        mode = 0o700
++                        uid = user_pwent.pw_uid
++                        gid = user_pwent.pw_gid
++                    os.makedirs(parent_folder, mode=mode, exist_ok=True)
++                    util.chownbyid(parent_folder, uid, gid)
+ 
+             permissions = check_permissions(username, parent_folder,
+                                             filename, False, strictmodes)
+             if not permissions:
+                 return False
+ 
++        if os.path.islink(filename) or os.path.isdir(filename):
++            LOG.debug("%s is not a file!", filename)
++            return False
++
+         # check the file
+         if not os.path.exists(filename):
+             # if file does not exist: we need to create it, since the
+diff --git a/tests/integration_tests/modules/test_ssh_keysfile.py b/tests/integration_tests/modules/test_ssh_keysfile.py
+index f82d7649..3159feb9 100644
+--- a/tests/integration_tests/modules/test_ssh_keysfile.py
++++ b/tests/integration_tests/modules/test_ssh_keysfile.py
+@@ -10,10 +10,10 @@ TEST_USER1_KEYS = get_test_rsa_keypair('test1')
+ TEST_USER2_KEYS = get_test_rsa_keypair('test2')
+ TEST_DEFAULT_KEYS = get_test_rsa_keypair('test3')
+ 
+-USERDATA = """\
++_USERDATA = """\
+ #cloud-config
+ bootcmd:
+- - sed -i 's;#AuthorizedKeysFile.*;AuthorizedKeysFile /etc/ssh/authorized_keys %h/.ssh/authorized_keys2;' /etc/ssh/sshd_config
++ - {bootcmd}
+ ssh_authorized_keys:
+  - {default}
+ users:
+@@ -24,27 +24,17 @@ users:
+ - name: test_user2
+   ssh_authorized_keys:
+     - {user2}
+-""".format(  # noqa: E501
++""".format(
++    bootcmd='{bootcmd}',
+     default=TEST_DEFAULT_KEYS.public_key,
+     user1=TEST_USER1_KEYS.public_key,
+     user2=TEST_USER2_KEYS.public_key,
+ )
+ 
+ 
+-@pytest.mark.ubuntu
+-@pytest.mark.user_data(USERDATA)
+-def test_authorized_keys(client: IntegrationInstance):
+-    expected_keys = [
+-        ('test_user1', '/home/test_user1/.ssh/authorized_keys2',
+-         TEST_USER1_KEYS),
+-        ('test_user2', '/home/test_user2/.ssh/authorized_keys2',
+-         TEST_USER2_KEYS),
+-        ('ubuntu', '/home/ubuntu/.ssh/authorized_keys2',
+-         TEST_DEFAULT_KEYS),
+-        ('root', '/root/.ssh/authorized_keys2', TEST_DEFAULT_KEYS),
+-    ]
+-
++def common_verify(client, expected_keys):
+     for user, filename, keys in expected_keys:
++        # Ensure key is in the key file
+         contents = client.read_from_file(filename)
+         if user in ['ubuntu', 'root']:
+             # Our personal public key gets added by pycloudlib
+@@ -83,3 +73,113 @@ def test_authorized_keys(client: IntegrationInstance):
+                     look_for_keys=False,
+                     allow_agent=False,
+                 )
++
++        # Ensure we haven't messed with any /home permissions
++        # See LP: #1940233
++        home_dir = '/home/{}'.format(user)
++        home_perms = '755'
++        if user == 'root':
++            home_dir = '/root'
++            home_perms = '700'
++        assert '{} {}'.format(user, home_perms) == client.execute(
++            'stat -c "%U %a" {}'.format(home_dir)
++        )
++        if client.execute("test -d {}/.ssh".format(home_dir)).ok:
++            assert '{} 700'.format(user) == client.execute(
++                'stat -c "%U %a" {}/.ssh'.format(home_dir)
++            )
++        assert '{} 600'.format(user) == client.execute(
++            'stat -c "%U %a" {}'.format(filename)
++        )
++
++        # Also ensure ssh-keygen works as expected
++        client.execute('mkdir {}/.ssh'.format(home_dir))
++        assert client.execute(
++            "ssh-keygen -b 2048 -t rsa -f {}/.ssh/id_rsa -q -N ''".format(
++                home_dir)
++        ).ok
++        assert client.execute('test -f {}/.ssh/id_rsa'.format(home_dir))
++        assert client.execute('test -f {}/.ssh/id_rsa.pub'.format(home_dir))
++
++    assert 'root 755' == client.execute('stat -c "%U %a" /home')
++
++
++DEFAULT_KEYS_USERDATA = _USERDATA.format(bootcmd='""')
++
++
++@pytest.mark.ubuntu
++@pytest.mark.user_data(DEFAULT_KEYS_USERDATA)
++def test_authorized_keys_default(client: IntegrationInstance):
++    expected_keys = [
++        ('test_user1', '/home/test_user1/.ssh/authorized_keys',
++         TEST_USER1_KEYS),
++        ('test_user2', '/home/test_user2/.ssh/authorized_keys',
++         TEST_USER2_KEYS),
++        ('ubuntu', '/home/ubuntu/.ssh/authorized_keys',
++         TEST_DEFAULT_KEYS),
++        ('root', '/root/.ssh/authorized_keys', TEST_DEFAULT_KEYS),
++    ]
++    common_verify(client, expected_keys)
++
++
++AUTHORIZED_KEYS2_USERDATA = _USERDATA.format(bootcmd=(
++    "sed -i 's;#AuthorizedKeysFile.*;AuthorizedKeysFile "
++    "/etc/ssh/authorized_keys %h/.ssh/authorized_keys2;' "
++    "/etc/ssh/sshd_config"))
++
++
++@pytest.mark.ubuntu
++@pytest.mark.user_data(AUTHORIZED_KEYS2_USERDATA)
++def test_authorized_keys2(client: IntegrationInstance):
++    expected_keys = [
++        ('test_user1', '/home/test_user1/.ssh/authorized_keys2',
++         TEST_USER1_KEYS),
++        ('test_user2', '/home/test_user2/.ssh/authorized_keys2',
++         TEST_USER2_KEYS),
++        ('ubuntu', '/home/ubuntu/.ssh/authorized_keys2',
++         TEST_DEFAULT_KEYS),
++        ('root', '/root/.ssh/authorized_keys2', TEST_DEFAULT_KEYS),
++    ]
++    common_verify(client, expected_keys)
++
++
++NESTED_KEYS_USERDATA = _USERDATA.format(bootcmd=(
++    "sed -i 's;#AuthorizedKeysFile.*;AuthorizedKeysFile "
++    "/etc/ssh/authorized_keys %h/foo/bar/ssh/keys;' "
++    "/etc/ssh/sshd_config"))
++
++
++@pytest.mark.ubuntu
++@pytest.mark.user_data(NESTED_KEYS_USERDATA)
++def test_nested_keys(client: IntegrationInstance):
++    expected_keys = [
++        ('test_user1', '/home/test_user1/foo/bar/ssh/keys',
++         TEST_USER1_KEYS),
++        ('test_user2', '/home/test_user2/foo/bar/ssh/keys',
++         TEST_USER2_KEYS),
++        ('ubuntu', '/home/ubuntu/foo/bar/ssh/keys',
++         TEST_DEFAULT_KEYS),
++        ('root', '/root/foo/bar/ssh/keys', TEST_DEFAULT_KEYS),
++    ]
++    common_verify(client, expected_keys)
++
++
++EXTERNAL_KEYS_USERDATA = _USERDATA.format(bootcmd=(
++    "sed -i 's;#AuthorizedKeysFile.*;AuthorizedKeysFile "
++    "/etc/ssh/authorized_keys /etc/ssh/authorized_keys/%u/keys;' "
++    "/etc/ssh/sshd_config"))
++
++
++@pytest.mark.ubuntu
++@pytest.mark.user_data(EXTERNAL_KEYS_USERDATA)
++def test_external_keys(client: IntegrationInstance):
++    expected_keys = [
++        ('test_user1', '/etc/ssh/authorized_keys/test_user1/keys',
++         TEST_USER1_KEYS),
++        ('test_user2', '/etc/ssh/authorized_keys/test_user2/keys',
++         TEST_USER2_KEYS),
++        ('ubuntu', '/etc/ssh/authorized_keys/ubuntu/keys',
++         TEST_DEFAULT_KEYS),
++        ('root', '/etc/ssh/authorized_keys/root/keys', TEST_DEFAULT_KEYS),
++    ]
++    common_verify(client, expected_keys)
+-- 
+2.27.0
+

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-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-Revert-unnecesary-lcase-in-ds-identify-978.patch

@@ -0,0 +1,47 @@
+From 532a36edf0dea2b98835bd08e285bec9c50eb0f9 Mon Sep 17 00:00:00 2001
+From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+Date: Fri, 14 Jan 2022 16:42:41 +0100
+Subject: [PATCH 5/6] Revert unnecesary lcase in ds-identify (#978)
+
+RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-MergeRequest: 43: Datasource for VMware
+RH-Commit: [5/6] 95634e4b42e3abfb91182b090c312eef29c63e54
+RH-Bugzilla: 2040704
+RH-Acked-by: Mohamed Gamal Morsy <mmorsy@redhat.com>
+RH-Acked-by: Eduardo Otubo <otubo@redhat.com>
+
+commit f516a7d37c1654addc02485e681b4358d7e7c0db
+Author: Andrew Kutz <101085+akutz@users.noreply.github.com>
+Date:   Fri Aug 13 14:30:55 2021 -0500
+
+    Revert unnecesary lcase in ds-identify (#978)
+
+    This patch reverts an unnecessary lcase optimization in the
+    ds-identify script. SystemD documents the values produced by
+    the systemd-detect-virt command are lower case, and the mapping
+    table used by the FreeBSD check is also lower-case.
+
+    The optimization added two new forked processes, needlessly
+    causing overhead.
+
+Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+---
+ tools/ds-identify | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/ds-identify b/tools/ds-identify
+index 0e12298f..7b782462 100755
+--- a/tools/ds-identify
++++ b/tools/ds-identify
+@@ -449,7 +449,7 @@ detect_virt() {
+ read_virt() {
+     cached "$DI_VIRT" && return 0
+     detect_virt
+-    DI_VIRT="$(echo "${_RET}" | tr '[:upper:]' '[:lower:]')"
++    DI_VIRT="${_RET}"
+ }
+ 
+ is_container() {
+-- 
+2.27.0
+

SOURCES/ci-Update-dscheck_VMware-s-rpctool-check-970.patch

@@ -0,0 +1,97 @@
+From cc79cb3958b943b755a9b11b3e87ce820058ccaa Mon Sep 17 00:00:00 2001
+From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+Date: Fri, 14 Jan 2022 16:41:47 +0100
+Subject: [PATCH 4/6] Update dscheck_VMware's rpctool check (#970)
+
+RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-MergeRequest: 43: Datasource for VMware
+RH-Commit: [4/6] 6f4d732c55c521869210d8aeedfa1150ea5a92f8
+RH-Bugzilla: 2040704
+RH-Acked-by: Mohamed Gamal Morsy <mmorsy@redhat.com>
+RH-Acked-by: Eduardo Otubo <otubo@redhat.com>
+
+commit 7781dec3306e9467f216cfcb36b7e10a8b38547a
+Author: Shreenidhi Shedi <53473811+sshedi@users.noreply.github.com>
+Date:   Fri Aug 13 00:40:39 2021 +0530
+
+    Update dscheck_VMware's rpctool check (#970)
+
+    This patch updates the dscheck_VMware function's use of "vmware-rpctool".
+
+    When checking to see if a "guestinfo" property is set.
+    Because a successful exit code can occur even if there is an empty
+    string returned, it is possible that the VMware datasource will be
+    loaded as a false-positive. This patch ensures that in addition to
+    validating the exit code, the emitted output is also examined to ensure
+    a non-empty value is returned by rpctool before returning "${DS_FOUND}"
+    from "dscheck_VMware()".
+
+Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+---
+ tools/ds-identify | 15 +++++++++------
+ 1 file changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/tools/ds-identify b/tools/ds-identify
+index c01eae3d..0e12298f 100755
+--- a/tools/ds-identify
++++ b/tools/ds-identify
+@@ -141,6 +141,7 @@ error() {
+     debug 0 "$@"
+     stderr "$@"
+ }
++
+ warn() {
+     set -- "WARN:" "$@"
+     debug 0 "$@"
+@@ -344,7 +345,6 @@ geom_label_status_as() {
+     return $ret
+ }
+ 
+-
+ read_fs_info_freebsd() {
+     local oifs="$IFS" line="" delim=","
+     local ret=0 labels="" dev="" label="" ftype="" isodevs=""
+@@ -404,7 +404,6 @@ cached() {
+     [ -n "$1" ] && _RET="$1" && return || return 1
+ }
+ 
+-
+ detect_virt() {
+     local virt="${UNAVAILABLE}" r="" out=""
+     if [ -d /run/systemd ]; then
+@@ -450,7 +449,7 @@ detect_virt() {
+ read_virt() {
+     cached "$DI_VIRT" && return 0
+     detect_virt
+-    DI_VIRT=${_RET}
++    DI_VIRT="$(echo "${_RET}" | tr '[:upper:]' '[:lower:]')"
+ }
+ 
+ is_container() {
+@@ -1370,16 +1369,20 @@ vmware_has_rpctool() {
+     command -v vmware-rpctool >/dev/null 2>&1
+ }
+ 
++vmware_rpctool_guestinfo() {
++    vmware-rpctool "info-get guestinfo.${1}" 2>/dev/null | grep "[[:alnum:]]"
++}
++
+ vmware_rpctool_guestinfo_metadata() {
+-    vmware-rpctool "info-get guestinfo.metadata"
++    vmware_rpctool_guestinfo "metadata"
+ }
+ 
+ vmware_rpctool_guestinfo_userdata() {
+-    vmware-rpctool "info-get guestinfo.userdata"
++    vmware_rpctool_guestinfo "userdata"
+ }
+ 
+ vmware_rpctool_guestinfo_vendordata() {
+-    vmware-rpctool "info-get guestinfo.vendordata"
++    vmware_rpctool_guestinfo "vendordata"
+ }
+ 
+ dscheck_VMware() {
+-- 
+2.27.0
+

SOURCES/ci-cc_ssh.py-fix-private-key-group-owner-and-permission.patch

@@ -0,0 +1,97 @@
+From 8dc357c036e393ae7d869d3074377f5447fa9b77 Mon Sep 17 00:00:00 2001
+From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+Date: Tue, 26 Oct 2021 22:18:06 +0200
+Subject: [PATCH] cc_ssh.py: fix private key group owner and permissions
+ (#1070)
+
+RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-MergeRequest: 34: cc_ssh.py: fix private key group owner and permissions (#1070)
+RH-Commit: [1/1] 6dfd47416dd2cb7ed3822199c43cbd2fdada7aa1 (eesposit/cloud-init)
+RH-Bugzilla: 2017697
+RH-Acked-by: Eduardo Otubo <otubo@redhat.com>
+RH-Acked-by: Mohamed Gamal Morsy <mmorsy@redhat.com>
+
+commit ee296ced9c0a61b1484d850b807c601bcd670ec1
+Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+Date:   Tue Oct 19 21:32:10 2021 +0200
+
+    cc_ssh.py: fix private key group owner and permissions (#1070)
+
+    When default host keys are created by sshd-keygen (/etc/ssh/ssh_host_*_key)
+    in RHEL/CentOS/Fedora, openssh it performs the following:
+
+    # create new keys
+    if ! $KEYGEN -q -t $KEYTYPE -f $KEY -C '' -N '' >&/dev/null; then
+            exit 1
+    fi
+
+    # sanitize permissions
+    /usr/bin/chgrp ssh_keys $KEY
+    /usr/bin/chmod 640 $KEY
+    /usr/bin/chmod 644 $KEY.pub
+    Note that the group ssh_keys exists only in RHEL/CentOS/Fedora.
+
+    Now that we disable sshd-keygen to allow only cloud-init to create
+    them, we miss the "sanitize permissions" part, where we set the group
+    owner as ssh_keys and the private key mode to 640.
+
+    According to https://bugzilla.redhat.com/show_bug.cgi?id=2013644#c8, failing
+    to set group ownership and permissions like openssh does makes the RHEL openscap
+    tool generate an error.
+
+    Signed-off-by: Emanuele Giuseppe Esposito eesposit@redhat.com
+
+    RHBZ: 2013644
+
+Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+---
+ cloudinit/config/cc_ssh.py |  7 +++++++
+ cloudinit/util.py          | 14 ++++++++++++++
+ 2 files changed, 21 insertions(+)
+
+diff --git a/cloudinit/config/cc_ssh.py b/cloudinit/config/cc_ssh.py
+index 05a16dbc..4e986c55 100755
+--- a/cloudinit/config/cc_ssh.py
++++ b/cloudinit/config/cc_ssh.py
+@@ -240,6 +240,13 @@ def handle(_name, cfg, cloud, log, _args):
+                 try:
+                     out, err = subp.subp(cmd, capture=True, env=lang_c)
+                     sys.stdout.write(util.decode_binary(out))
++
++                    gid = util.get_group_id("ssh_keys")
++                    if gid != -1:
++                        # perform same "sanitize permissions" as sshd-keygen
++                        os.chown(keyfile, -1, gid)
++                        os.chmod(keyfile, 0o640)
++                        os.chmod(keyfile + ".pub", 0o644)
+                 except subp.ProcessExecutionError as e:
+                     err = util.decode_binary(e.stderr).lower()
+                     if (e.exit_code == 1 and
+diff --git a/cloudinit/util.py b/cloudinit/util.py
+index 343976ad..fe37ae89 100644
+--- a/cloudinit/util.py
++++ b/cloudinit/util.py
+@@ -1831,6 +1831,20 @@ def chmod(path, mode):
+             os.chmod(path, real_mode)
+ 
+ 
++def get_group_id(grp_name: str) -> int:
++    """
++    Returns the group id of a group name, or -1 if no group exists
++
++    @param grp_name: the name of the group
++    """
++    gid = -1
++    try:
++        gid = grp.getgrnam(grp_name).gr_gid
++    except KeyError:
++        LOG.debug("Group %s is not a valid group name", grp_name)
++    return gid
++
++
+ def get_permissions(path: str) -> int:
+     """
+     Returns the octal permissions of the file/folder pointed by the path,
+-- 
+2.27.0
+

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-cloudinit-net-handle-two-different-routes-for-the-sa.patch

@@ -0,0 +1,87 @@
+From 0a6a89e6b243e587daf8ce356fccb5d6a6acf089 Mon Sep 17 00:00:00 2001
+From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+Date: Tue, 7 Dec 2021 09:56:58 +0100
+Subject: [PATCH] cloudinit/net: handle two different routes for the same ip
+ (#1124)
+
+RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-MergeRequest: 37: cloudinit/net: handle two different routes for the same ip (#1124)
+RH-Commit: [1/1] 9cd9c38606bfe2395d808a48ac986dce7624e147
+RH-Bugzilla: 2028756
+RH-Acked-by: Mohamed Gamal Morsy <mmorsy@redhat.com>
+RH-Acked-by: Eduardo Otubo <otubo@redhat.com>
+
+commit 0e25076b34fa995161b83996e866c0974cee431f
+Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+Date:   Mon Dec 6 18:34:26 2021 +0100
+
+    cloudinit/net: handle two different routes for the same ip (#1124)
+
+    If we set a dhcp server side like this:
+    $ cat /var/tmp/cloud-init/cloud-init-dhcp-f0rie5tm/dhcp.leases
+    lease {
+    ...
+    option classless-static-routes 31.169.254.169.254 0.0.0.0,31.169.254.169.254
+        10.112.143.127,22.10.112.140 0.0.0.0,0 10.112.140.1;
+    ...
+    }
+    cloud-init fails to configure the routes via 'ip route add' because to there are
+    two different routes for 169.254.169.254:
+
+    $ ip -4 route add 192.168.1.1/32 via 0.0.0.0 dev eth0
+    $ ip -4 route add 192.168.1.1/32 via 10.112.140.248 dev eth0
+
+    But NetworkManager can handle such scenario successfully as it uses "ip route append".
+    So change cloud-init to also use "ip route append" to fix the issue:
+
+    $ ip -4 route append 192.168.1.1/32 via 0.0.0.0 dev eth0
+    $ ip -4 route append 192.168.1.1/32 via 10.112.140.248 dev eth0
+
+    Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+
+    RHBZ: #2003231
+
+Conflicts:
+    cloudinit/net/tests/test_init.py: a mock call in
+    test_ephemeral_ipv4_network_with_rfc3442_static_routes is not
+    present downstream.
+
+Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+---
+ cloudinit/net/__init__.py        | 2 +-
+ cloudinit/net/tests/test_init.py | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/cloudinit/net/__init__.py b/cloudinit/net/__init__.py
+index 385b7bcc..003efa2a 100644
+--- a/cloudinit/net/__init__.py
++++ b/cloudinit/net/__init__.py
+@@ -1138,7 +1138,7 @@ class EphemeralIPv4Network(object):
+             if gateway != "0.0.0.0/0":
+                 via_arg = ['via', gateway]
+             subp.subp(
+-                ['ip', '-4', 'route', 'add', net_address] + via_arg +
++                ['ip', '-4', 'route', 'append', net_address] + via_arg +
+                 ['dev', self.interface], capture=True)
+             self.cleanup_cmds.insert(
+                 0, ['ip', '-4', 'route', 'del', net_address] + via_arg +
+diff --git a/cloudinit/net/tests/test_init.py b/cloudinit/net/tests/test_init.py
+index 946f8ee2..2350837b 100644
+--- a/cloudinit/net/tests/test_init.py
++++ b/cloudinit/net/tests/test_init.py
+@@ -719,10 +719,10 @@ class TestEphemeralIPV4Network(CiTestCase):
+                 ['ip', '-family', 'inet', 'link', 'set', 'dev', 'eth0', 'up'],
+                 capture=True),
+             mock.call(
+-                ['ip', '-4', 'route', 'add', '169.254.169.254/32',
++                ['ip', '-4', 'route', 'append', '169.254.169.254/32',
+                  'via', '192.168.2.1', 'dev', 'eth0'], capture=True),
+             mock.call(
+-                ['ip', '-4', 'route', 'add', '0.0.0.0/0',
++                ['ip', '-4', 'route', 'append', '0.0.0.0/0',
+                  'via', '192.168.2.1', 'dev', 'eth0'], capture=True)]
+         expected_teardown_calls = [
+             mock.call(
+-- 
+2.27.0
+

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-fix-error-on-upgrade-caused-by-new-vendordata2-attri.patch

@@ -0,0 +1,173 @@
+From 3636c2284132dbcd1cc505fb9f81ab722f4f99f0 Mon Sep 17 00:00:00 2001
+From: Amy Chen <xiachen@redhat.com>
+Date: Fri, 3 Dec 2021 14:38:16 +0800
+Subject: [PATCH] fix error on upgrade caused by new vendordata2 attributes
+
+RH-Author: xiachen <None>
+RH-MergeRequest: 36: fix error on upgrade caused by new vendordata2 attributes
+RH-Commit: [1/1] c16351924d4220a719380f12c2e8c03185f53c01
+RH-Bugzilla: 2028738
+RH-Acked-by: Mohamed Gamal Morsy <mmorsy@redhat.com>
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Acked-by: Eduardo Otubo <otubo@redhat.com>
+
+commit d132356cc361abef2d90d4073438f3ab759d5964
+Author: James Falcon <TheRealFalcon@users.noreply.github.com>
+Date:   Mon Apr 19 11:31:28 2021 -0500
+
+    fix error on upgrade caused by new vendordata2 attributes (#869)
+
+    In #777, we added 'vendordata2' and 'vendordata2_raw' attributes to
+    the DataSource class, but didn't use the upgrade framework to deal
+    with an unpickle after upgrade. This commit adds the necessary
+    upgrade code.
+
+    Additionally, added a smaller-scope upgrade test to our integration
+    tests that will be run on every CI run so we catch these issues
+    immediately in the future.
+
+    LP: #1922739
+
+Signed-off-by: Amy Chen <xiachen@redhat.com>
+---
+ cloudinit/sources/__init__.py           | 12 +++++++++++-
+ cloudinit/tests/test_upgrade.py         |  4 ++++
+ tests/integration_tests/clouds.py       |  4 ++--
+ tests/integration_tests/test_upgrade.py | 25 ++++++++++++++++++++++++-
+ 4 files changed, 41 insertions(+), 4 deletions(-)
+
+diff --git a/cloudinit/sources/__init__.py b/cloudinit/sources/__init__.py
+index 1ad1880d..7d74f8d9 100644
+--- a/cloudinit/sources/__init__.py
++++ b/cloudinit/sources/__init__.py
+@@ -24,6 +24,7 @@ from cloudinit import util
+ from cloudinit.atomic_helper import write_json
+ from cloudinit.event import EventType
+ from cloudinit.filters import launch_index
++from cloudinit.persistence import CloudInitPickleMixin
+ from cloudinit.reporting import events
+ 
+ DSMODE_DISABLED = "disabled"
+@@ -134,7 +135,7 @@ URLParams = namedtuple(
+     'URLParms', ['max_wait_seconds', 'timeout_seconds', 'num_retries'])
+ 
+ 
+-class DataSource(metaclass=abc.ABCMeta):
++class DataSource(CloudInitPickleMixin, metaclass=abc.ABCMeta):
+ 
+     dsmode = DSMODE_NETWORK
+     default_locale = 'en_US.UTF-8'
+@@ -196,6 +197,8 @@ class DataSource(metaclass=abc.ABCMeta):
+     # non-root users
+     sensitive_metadata_keys = ('merged_cfg', 'security-credentials',)
+ 
++    _ci_pkl_version = 1
++
+     def __init__(self, sys_cfg, distro, paths, ud_proc=None):
+         self.sys_cfg = sys_cfg
+         self.distro = distro
+@@ -218,6 +221,13 @@ class DataSource(metaclass=abc.ABCMeta):
+         else:
+             self.ud_proc = ud_proc
+ 
++    def _unpickle(self, ci_pkl_version: int) -> None:
++        """Perform deserialization fixes for Paths."""
++        if not hasattr(self, 'vendordata2'):
++            self.vendordata2 = None
++        if not hasattr(self, 'vendordata2_raw'):
++            self.vendordata2_raw = None
++
+     def __str__(self):
+         return type_utils.obj_name(self)
+ 
+diff --git a/cloudinit/tests/test_upgrade.py b/cloudinit/tests/test_upgrade.py
+index f79a2536..fd3c5812 100644
+--- a/cloudinit/tests/test_upgrade.py
++++ b/cloudinit/tests/test_upgrade.py
+@@ -43,3 +43,7 @@ class TestUpgrade:
+     def test_blacklist_drivers_set_on_networking(self, previous_obj_pkl):
+         """We always expect Networking.blacklist_drivers to be initialised."""
+         assert previous_obj_pkl.distro.networking.blacklist_drivers is None
++
++    def test_vendordata_exists(self, previous_obj_pkl):
++        assert previous_obj_pkl.vendordata2 is None
++        assert previous_obj_pkl.vendordata2_raw is None
+diff --git a/tests/integration_tests/clouds.py b/tests/integration_tests/clouds.py
+index 9527a413..1d0b9d83 100644
+--- a/tests/integration_tests/clouds.py
++++ b/tests/integration_tests/clouds.py
+@@ -100,14 +100,14 @@ class IntegrationCloud(ABC):
+             # Even if we're using the default key, it may still have a
+             # different name in the clouds, so we need to set it separately.
+             self.cloud_instance.key_pair.name = settings.KEYPAIR_NAME
+-        self._released_image_id = self._get_initial_image()
++        self.released_image_id = self._get_initial_image()
+         self.snapshot_id = None
+ 
+     @property
+     def image_id(self):
+         if self.snapshot_id:
+             return self.snapshot_id
+-        return self._released_image_id
++        return self.released_image_id
+ 
+     def emit_settings_to_log(self) -> None:
+         log.info(
+diff --git a/tests/integration_tests/test_upgrade.py b/tests/integration_tests/test_upgrade.py
+index c20cb3c1..48e0691b 100644
+--- a/tests/integration_tests/test_upgrade.py
++++ b/tests/integration_tests/test_upgrade.py
+@@ -1,4 +1,5 @@
+ import logging
++import os
+ import pytest
+ import time
+ from pathlib import Path
+@@ -8,6 +9,8 @@ from tests.integration_tests.conftest import (
+     get_validated_source,
+     session_start_time,
+ )
++from tests.integration_tests.instances import CloudInitSource
++
+ 
+ log = logging.getLogger('integration_testing')
+ 
+@@ -63,7 +66,7 @@ def test_upgrade(session_cloud: IntegrationCloud):
+         return  # type checking doesn't understand that skip raises
+ 
+     launch_kwargs = {
+-        'image_id': session_cloud._get_initial_image(),
++        'image_id': session_cloud.released_image_id,
+     }
+ 
+     image = ImageSpecification.from_os_image()
+@@ -93,6 +96,26 @@ def test_upgrade(session_cloud: IntegrationCloud):
+         instance.install_new_cloud_init(source, take_snapshot=False)
+         instance.execute('hostname something-else')
+         _restart(instance)
++        assert instance.execute('cloud-init status --wait --long').ok
+         _output_to_compare(instance, after_path, netcfg_path)
+ 
+     log.info('Wrote upgrade test logs to %s and %s', before_path, after_path)
++
++
++@pytest.mark.ci
++@pytest.mark.ubuntu
++def test_upgrade_package(session_cloud: IntegrationCloud):
++    if get_validated_source(session_cloud) != CloudInitSource.DEB_PACKAGE:
++        not_run_message = 'Test only supports upgrading to build deb'
++        if os.environ.get('TRAVIS'):
++            # If this isn't running on CI, we should know
++            pytest.fail(not_run_message)
++        else:
++            pytest.skip(not_run_message)
++
++    launch_kwargs = {'image_id': session_cloud.released_image_id}
++
++    with session_cloud.launch(launch_kwargs=launch_kwargs) as instance:
++        instance.install_deb()
++        instance.restart()
++        assert instance.execute('cloud-init status --wait --long').ok
+-- 
+2.27.0
+

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-rhel-cloud.cfg-remove-ssh_genkeytypes-in-settings.py.patch

@@ -0,0 +1,65 @@
+From abf1adeae8211f5acd87dc63b03b2ed995047efd Mon Sep 17 00:00:00 2001
+From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+Date: Thu, 20 May 2021 08:53:55 +0200
+Subject: [PATCH 1/2] 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 43a1490c..2acf2615 100644
+--- a/cloudinit/settings.py
++++ b/cloudinit/settings.py
+@@ -49,8 +49,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.27.0
+

SOURCES/ci-ssh-util-allow-cloudinit-to-merge-all-ssh-keys-into-.patch

@@ -0,0 +1,653 @@
+From aeab67600eb2d5e483812620b56ce5fb031a57d6 Mon Sep 17 00:00:00 2001
+From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+Date: Mon, 12 Jul 2021 21:47:37 +0200
+Subject: [PATCH] ssh-util: allow cloudinit to merge all ssh keys into a custom
+ user file, defined in AuthorizedKeysFile (#937)
+
+RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-MergeRequest: 25: ssh-util: allow cloudinit to merge all ssh keys into a custom user file, defined in AuthorizedKeysFile (#937)
+RH-Commit: [1/1] 27bbe94f3b9dd8734865766bd30b06cff83383ab (eesposit/cloud-init)
+RH-Bugzilla: 1862967
+RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
+RH-Acked-by: Mohamed Gamal Morsy <mmorsy@redhat.com>
+
+TESTED: By me and QA
+BREW: 38030830
+
+Conflicts: upstream patch modifies tests/integration_tests/util.py, that is
+not present in RHEL.
+
+commit 9b52405c6f0de5e00d5ee9c1d13540425d8f6bf5
+Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+Date:   Mon Jul 12 20:21:02 2021 +0200
+
+    ssh-util: allow cloudinit to merge all ssh keys into a custom user file, defined in AuthorizedKeysFile (#937)
+
+    This patch aims to fix LP1911680, by analyzing the files provided
+    in sshd_config and merge all keys into an user-specific file. Also
+    introduces additional tests to cover this specific case.
+
+    The file is picked by analyzing the path given in AuthorizedKeysFile.
+
+    If it points inside the current user folder (path is /home/user/*), it
+    means it is an user-specific file, so we can copy all user-keys there.
+    If it contains a %u or %h, it means that there will be a specific
+    authorized_keys file for each user, so we can copy all user-keys there.
+    If no path points to an user-specific file, for example when only
+    /etc/ssh/authorized_keys is given, default to ~/.ssh/authorized_keys.
+    Note that if there are more than a single user-specific file, the last
+    one will be picked.
+
+    Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+    Co-authored-by: James Falcon <therealfalcon@gmail.com>
+
+    LP: #1911680
+    RHBZ:1862967
+
+Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+---
+ cloudinit/ssh_util.py                         |  22 +-
+ .../assets/keys/id_rsa.test1                  |  38 +++
+ .../assets/keys/id_rsa.test1.pub              |   1 +
+ .../assets/keys/id_rsa.test2                  |  38 +++
+ .../assets/keys/id_rsa.test2.pub              |   1 +
+ .../assets/keys/id_rsa.test3                  |  38 +++
+ .../assets/keys/id_rsa.test3.pub              |   1 +
+ .../modules/test_ssh_keysfile.py              |  85 ++++++
+ tests/unittests/test_sshutil.py               | 246 +++++++++++++++++-
+ 9 files changed, 456 insertions(+), 14 deletions(-)
+ create mode 100644 tests/integration_tests/assets/keys/id_rsa.test1
+ create mode 100644 tests/integration_tests/assets/keys/id_rsa.test1.pub
+ create mode 100644 tests/integration_tests/assets/keys/id_rsa.test2
+ create mode 100644 tests/integration_tests/assets/keys/id_rsa.test2.pub
+ create mode 100644 tests/integration_tests/assets/keys/id_rsa.test3
+ create mode 100644 tests/integration_tests/assets/keys/id_rsa.test3.pub
+ create mode 100644 tests/integration_tests/modules/test_ssh_keysfile.py
+
+diff --git a/cloudinit/ssh_util.py b/cloudinit/ssh_util.py
+index c08042d6..89057262 100644
+--- a/cloudinit/ssh_util.py
++++ b/cloudinit/ssh_util.py
+@@ -252,13 +252,15 @@ def render_authorizedkeysfile_paths(value, homedir, username):
+ def extract_authorized_keys(username, sshd_cfg_file=DEF_SSHD_CFG):
+     (ssh_dir, pw_ent) = users_ssh_info(username)
+     default_authorizedkeys_file = os.path.join(ssh_dir, 'authorized_keys')
++    user_authorizedkeys_file = default_authorizedkeys_file
+     auth_key_fns = []
+     with util.SeLinuxGuard(ssh_dir, recursive=True):
+         try:
+             ssh_cfg = parse_ssh_config_map(sshd_cfg_file)
++            key_paths = ssh_cfg.get("authorizedkeysfile",
++                                    "%h/.ssh/authorized_keys")
+             auth_key_fns = render_authorizedkeysfile_paths(
+-                ssh_cfg.get("authorizedkeysfile", "%h/.ssh/authorized_keys"),
+-                pw_ent.pw_dir, username)
++                key_paths, pw_ent.pw_dir, username)
+ 
+         except (IOError, OSError):
+             # Give up and use a default key filename
+@@ -267,8 +269,22 @@ def extract_authorized_keys(username, sshd_cfg_file=DEF_SSHD_CFG):
+                         "config from %r, using 'AuthorizedKeysFile' file "
+                         "%r instead", DEF_SSHD_CFG, auth_key_fns[0])
+ 
++    # check if one of the keys is the user's one
++    for key_path, auth_key_fn in zip(key_paths.split(), auth_key_fns):
++        if any([
++            '%u' in key_path,
++            '%h' in key_path,
++            auth_key_fn.startswith('{}/'.format(pw_ent.pw_dir))
++        ]):
++            user_authorizedkeys_file = auth_key_fn
++
++    if user_authorizedkeys_file != default_authorizedkeys_file:
++        LOG.debug(
++            "AuthorizedKeysFile has an user-specific authorized_keys, "
++            "using %s", user_authorizedkeys_file)
++
+     # always store all the keys in the user's private file
+-    return (default_authorizedkeys_file, parse_authorized_keys(auth_key_fns))
++    return (user_authorizedkeys_file, parse_authorized_keys(auth_key_fns))
+ 
+ 
+ def setup_user_keys(keys, username, options=None):
+diff --git a/tests/integration_tests/assets/keys/id_rsa.test1 b/tests/integration_tests/assets/keys/id_rsa.test1
+new file mode 100644
+index 00000000..bd4c822e
+--- /dev/null
++++ b/tests/integration_tests/assets/keys/id_rsa.test1
+@@ -0,0 +1,38 @@
++-----BEGIN OPENSSH PRIVATE KEY-----
++b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABlwAAAAdzc2gtcn
++NhAAAAAwEAAQAAAYEAtRlG96aJ23URvAgO/bBsuLl+lquc350aSwV98/i8vlvOn5GVcHye
++t/rXQg4lZ4s0owG3kWyQFY8nvTk+G+UNU8fN0anAzBDi+4MzsejkF9scjTMFmXVrIpICqV
++3bYQNjPv6r+ubQdkD01du3eB9t5/zl84gtshp0hBdofyz8u1/A25s7fVU67GyI7PdKvaS+
++yvJSInZnb2e9VQzfJC+qAnN7gUZatBKjdgUtJeiUUeDaVnaS17b0aoT9iBO0sIcQtOTBlY
++lCjFt1TAMLZ64Hj3SfGZB7Yj0Z+LzFB2IWX1zzsjI68YkYPKOSL/NYhQU9e55kJQ7WnngN
++HY/2n/A7dNKSFDmgM5c9IWgeZ7fjpsfIYAoJ/CAxFIND+PEHd1gCS6xoEhaUVyh5WH/Xkw
++Kv1nx4AiZ2BFCE+75kySRLZUJ+5y0r3DU5ktMXeURzVIP7pu0R8DCul+GU+M/+THyWtAEO
++geaNJ6fYpo2ipDhbmTYt3kk2lMIapRxGBFs+37sdAAAFgGGJssNhibLDAAAAB3NzaC1yc2
++EAAAGBALUZRvemidt1EbwIDv2wbLi5fparnN+dGksFffP4vL5bzp+RlXB8nrf610IOJWeL
++NKMBt5FskBWPJ705PhvlDVPHzdGpwMwQ4vuDM7Ho5BfbHI0zBZl1ayKSAqld22EDYz7+q/
++rm0HZA9NXbt3gfbef85fOILbIadIQXaH8s/LtfwNubO31VOuxsiOz3Sr2kvsryUiJ2Z29n
++vVUM3yQvqgJze4FGWrQSo3YFLSXolFHg2lZ2kte29GqE/YgTtLCHELTkwZWJQoxbdUwDC2
++euB490nxmQe2I9Gfi8xQdiFl9c87IyOvGJGDyjki/zWIUFPXueZCUO1p54DR2P9p/wO3TS
++khQ5oDOXPSFoHme346bHyGAKCfwgMRSDQ/jxB3dYAkusaBIWlFcoeVh/15MCr9Z8eAImdg
++RQhPu+ZMkkS2VCfuctK9w1OZLTF3lEc1SD+6btEfAwrpfhlPjP/kx8lrQBDoHmjSen2KaN
++oqQ4W5k2Ld5JNpTCGqUcRgRbPt+7HQAAAAMBAAEAAAGBAJJCTOd70AC2ptEGbR0EHHqADT
++Wgefy7A94tHFEqxTy0JscGq/uCGimaY7kMdbcPXT59B4VieWeAC2cuUPP0ZHQSfS5ke7oT
++tU3N47U+0uBVbNS4rUAH7bOo2o9wptnOA5x/z+O+AARRZ6tEXQOd1oSy4gByLf2Wkh2QTi
++vP6Hln1vlFgKEzcXg6G8fN3MYWxKRhWmZM3DLERMvorlqqSBLcs5VvfZfLKcsKWTExioAq
++KgwEjYm8T9+rcpsw1xBus3j9k7wCI1Sus6PCDjq0pcYKLMYM7p8ygnU2tRYrOztdIxgWRA
++w/1oenm1Mqq2tV5xJcBCwCLOGe6SFwkIRywOYc57j5McH98Xhhg9cViyyBdXy/baF0mro+
++qPhOsWDxqwD4VKZ9UmQ6O8kPNKcc7QcIpFJhcO0g9zbp/MT0KueaWYrTKs8y4lUkTT7Xz6
+++MzlR122/JwlAbBo6Y2kWtB+y+XwBZ0BfyJsm2czDhKm7OI5KfuBNhq0tFfKwOlYBq4QAA
++AMAyvUof1R8LLISkdO3EFTKn5RGNkPPoBJmGs6LwvU7NSjjLj/wPQe4jsIBc585tvbrddp
++60h72HgkZ5tqOfdeBYOKqX0qQQBHUEvI6M+NeQTQRev8bCHMLXQ21vzpClnrwNzlja359E
++uTRfiPRwIlyPLhOUiClBDSAnBI9h82Hkk3zzsQ/xGfsPB7iOjRbW69bMRSVCRpeweCVmWC
++77DTsEOq69V2TdljhQNIXE5OcOWonIlfgPiI74cdd+dLhzc/AAAADBAO1/JXd2kYiRyNkZ
++aXTLcwiSgBQIYbobqVP3OEtTclr0P1JAvby3Y4cCaEhkenx+fBqgXAku5lKM+U1Q9AEsMk
++cjIhaDpb43rU7GPjMn4zHwgGsEKd5pC1yIQ2PlK+cHanAdsDjIg+6RR+fuvid/mBeBOYXb
++Py0sa3HyekLJmCdx4UEyNASoiNaGFLQVAqo+RACsXy6VMxFH5dqDYlvwrfUQLwxJmse9Vb
++GEuuPAsklNugZqssC2XOIujFVUpslduQAAAMEAwzVHQVtsc3icCSzEAARpDTUdTbI29OhB
++/FMBnjzS9/3SWfLuBOSm9heNCHs2jdGNb8cPdKZuY7S9Fx6KuVUPyTbSSYkjj0F4fTeC9g
++0ym4p4UWYdF67WSWwLORkaG8K0d+G/CXkz8hvKUg6gcZWKBHAE1ROrHu1nsc8v7mkiKq4I
++bnTw5Q9TgjbWcQWtgPq0wXyyl/K8S1SFdkMCTOHDD0RQ+jTV2WNGVwFTodIRHenX+Rw2g4
++CHbTWbsFrHR1qFAAAACmphbWVzQG5ld3Q=
++-----END OPENSSH PRIVATE KEY-----
+diff --git a/tests/integration_tests/assets/keys/id_rsa.test1.pub b/tests/integration_tests/assets/keys/id_rsa.test1.pub
+new file mode 100644
+index 00000000..3d2e26e1
+--- /dev/null
++++ b/tests/integration_tests/assets/keys/id_rsa.test1.pub
+@@ -0,0 +1 @@
++ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC1GUb3ponbdRG8CA79sGy4uX6Wq5zfnRpLBX3z+Ly+W86fkZVwfJ63+tdCDiVnizSjAbeRbJAVjye9OT4b5Q1Tx83RqcDMEOL7gzOx6OQX2xyNMwWZdWsikgKpXdthA2M+/qv65tB2QPTV27d4H23n/OXziC2yGnSEF2h/LPy7X8Dbmzt9VTrsbIjs90q9pL7K8lIidmdvZ71VDN8kL6oCc3uBRlq0EqN2BS0l6JRR4NpWdpLXtvRqhP2IE7SwhxC05MGViUKMW3VMAwtnrgePdJ8ZkHtiPRn4vMUHYhZfXPOyMjrxiRg8o5Iv81iFBT17nmQlDtaeeA0dj/af8Dt00pIUOaAzlz0haB5nt+Omx8hgCgn8IDEUg0P48Qd3WAJLrGgSFpRXKHlYf9eTAq/WfHgCJnYEUIT7vmTJJEtlQn7nLSvcNTmS0xd5RHNUg/um7RHwMK6X4ZT4z/5MfJa0AQ6B5o0np9imjaKkOFuZNi3eSTaUwhqlHEYEWz7fux0= test1@host
+diff --git a/tests/integration_tests/assets/keys/id_rsa.test2 b/tests/integration_tests/assets/keys/id_rsa.test2
+new file mode 100644
+index 00000000..5854d901
+--- /dev/null
++++ b/tests/integration_tests/assets/keys/id_rsa.test2
+@@ -0,0 +1,38 @@
++-----BEGIN OPENSSH PRIVATE KEY-----
++b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABlwAAAAdzc2gtcn
++NhAAAAAwEAAQAAAYEAvK50D2PWOc4ikyHVRJS6tDhqzjL5cKiivID4p1X8BYCVw83XAEGO
++LnItUyVXHNADlh6fpVq1NY6A2JVtygoPF6ZFx8ph7IWMmnhDdnxLLyGsbhd1M1tiXJD/R+
++3WnGHRJ4PKrQavMLgqHRrieV3QVVfjFSeo6jX/4TruP6ZmvITMZWJrXaGphxJ/pPykEdkO
++i8AmKU9FNviojyPS2nNtj9B/635IdgWvrd7Vf5Ycsw9MR55LWSidwa856RH62Yl6LpEGTH
++m1lJiMk1u88JPSqvohhaUkLKkFpcQwcB0m76W1KOyllJsmX8bNXrlZsI+WiiYI7Xl5vQm2
++17DEuNeavtPAtDMxu8HmTg2UJ55Naxehbfe2lx2k5kYGGw3i1O1OVN2pZ2/OB71LucYd/5
++qxPaz03wswcGOJYGPkNc40vdES/Scc7Yt8HsnZuzqkyOgzn0HiUCzoYUYLYTpLf+yGmwxS
++yAEY056aOfkCsboKHOKiOmlJxNaZZFQkX1evep4DAAAFgC7HMbUuxzG1AAAAB3NzaC1yc2
++EAAAGBALyudA9j1jnOIpMh1USUurQ4as4y+XCooryA+KdV/AWAlcPN1wBBji5yLVMlVxzQ
++A5Yen6VatTWOgNiVbcoKDxemRcfKYeyFjJp4Q3Z8Sy8hrG4XdTNbYlyQ/0ft1pxh0SeDyq
++0GrzC4Kh0a4nld0FVX4xUnqOo1/+E67j+mZryEzGVia12hqYcSf6T8pBHZDovAJilPRTb4
++qI8j0tpzbY/Qf+t+SHYFr63e1X+WHLMPTEeeS1koncGvOekR+tmJei6RBkx5tZSYjJNbvP
++CT0qr6IYWlJCypBaXEMHAdJu+ltSjspZSbJl/GzV65WbCPloomCO15eb0JttewxLjXmr7T
++wLQzMbvB5k4NlCeeTWsXoW33tpcdpOZGBhsN4tTtTlTdqWdvzge9S7nGHf+asT2s9N8LMH
++BjiWBj5DXONL3REv0nHO2LfB7J2bs6pMjoM59B4lAs6GFGC2E6S3/shpsMUsgBGNOemjn5
++ArG6ChziojppScTWmWRUJF9Xr3qeAwAAAAMBAAEAAAGASj/kkEHbhbfmxzujL2/P4Sfqb+
++aDXqAeGkwujbs6h/fH99vC5ejmSMTJrVSeaUo6fxLiBDIj6UWA0rpLEBzRP59BCpRL4MXV
++RNxav/+9nniD4Hb+ug0WMhMlQmsH71ZW9lPYqCpfOq7ec8GmqdgPKeaCCEspH7HMVhfYtd
++eHylwAC02lrpz1l5/h900sS5G9NaWR3uPA+xbzThDs4uZVkSidjlCNt1QZhDSSk7jA5n34
++qJ5UTGu9WQDZqyxWKND+RIyQuFAPGQyoyCC1FayHO2sEhT5qHuumL14Mn81XpzoXFoKyql
++rhBDe+pHhKArBYt92Evch0k1ABKblFxtxLXcvk4Fs7pHi+8k4+Cnazej2kcsu1kURlMZJB
++w2QT/8BV4uImbH05LtyscQuwGzpIoxqrnHrvg5VbohStmhoOjYybzqqW3/M0qhkn5JgTiy
++dJcHRJisRnAcmbmEchYtLDi6RW1e022H4I9AFXQqyr5HylBq6ugtWcFCsrcX8ibZ8xAAAA
++wQCAOPgwae6yZLkrYzRfbxZtGKNmhpI0EtNSDCHYuQQapFZJe7EFENs/VAaIiiut0yajGj
++c3aoKcwGIoT8TUM8E3GSNW6+WidUOC7H6W+/6N2OYZHRBACGz820xO+UBCl2oSk+dLBlfr
++IQzBGUWn5uVYCs0/2nxfCdFyHtMK8dMF/ypbdG+o1rXz5y9b7PVG6Mn+o1Rjsdkq7VERmy
++Pukd8hwATOIJqoKl3TuFyBeYFLqe+0e7uTeswQFw17PF31VjAAAADBAOpJRQb8c6qWqsvv
++vkve0uMuL0DfWW0G6+SxjPLcV6aTWL5xu0Grd8uBxDkkHU/CDrAwpchXyuLsvbw21Eje/u
++U5k9nLEscWZwcX7odxlK+EfAY2Bf5+Hd9bH5HMzTRJH8KkWK1EppOLPyiDxz4LZGzPLVyv
++/1PgSuvXkSWk1KIE4SvSemyxGX2tPVI6uO+URqevfnPOS1tMB7BMQlgkR6eh4bugx9UYx9
++mwlXonNa4dN0iQxZ7N4rKFBbT/uyB2bQAAAMEAzisnkD8k9Tn8uyhxpWLHwb03X4ZUUHDV
++zu15e4a8dZ+mM8nHO986913Xz5JujlJKkGwFTvgWkIiR2zqTEauZHARH7gANpaweTm6lPd
++E4p2S0M3ulY7xtp9lCFIrDhMPPkGq8SFZB6qhgucHcZSRLq6ZDou3S2IdNOzDTpBtkhRCS
++0zFcdTLh3zZweoy8HGbW36bwB6s1CIL76Pd4F64i0Ms9CCCU6b+E5ArFhYQIsXiDbgHWbD
++tZRSm2GEgnDGAvAAAACmphbWVzQG5ld3Q=
++-----END OPENSSH PRIVATE KEY-----
+diff --git a/tests/integration_tests/assets/keys/id_rsa.test2.pub b/tests/integration_tests/assets/keys/id_rsa.test2.pub
+new file mode 100644
+index 00000000..f3831a57
+--- /dev/null
++++ b/tests/integration_tests/assets/keys/id_rsa.test2.pub
+@@ -0,0 +1 @@
++ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC8rnQPY9Y5ziKTIdVElLq0OGrOMvlwqKK8gPinVfwFgJXDzdcAQY4uci1TJVcc0AOWHp+lWrU1joDYlW3KCg8XpkXHymHshYyaeEN2fEsvIaxuF3UzW2JckP9H7dacYdEng8qtBq8wuCodGuJ5XdBVV+MVJ6jqNf/hOu4/pma8hMxlYmtdoamHEn+k/KQR2Q6LwCYpT0U2+KiPI9Lac22P0H/rfkh2Ba+t3tV/lhyzD0xHnktZKJ3BrznpEfrZiXoukQZMebWUmIyTW7zwk9Kq+iGFpSQsqQWlxDBwHSbvpbUo7KWUmyZfxs1euVmwj5aKJgjteXm9CbbXsMS415q+08C0MzG7weZODZQnnk1rF6Ft97aXHaTmRgYbDeLU7U5U3alnb84HvUu5xh3/mrE9rPTfCzBwY4lgY+Q1zjS90RL9Jxzti3weydm7OqTI6DOfQeJQLOhhRgthOkt/7IabDFLIARjTnpo5+QKxugoc4qI6aUnE1plkVCRfV696ngM= test2@host
+diff --git a/tests/integration_tests/assets/keys/id_rsa.test3 b/tests/integration_tests/assets/keys/id_rsa.test3
+new file mode 100644
+index 00000000..2596c762
+--- /dev/null
++++ b/tests/integration_tests/assets/keys/id_rsa.test3
+@@ -0,0 +1,38 @@
++-----BEGIN OPENSSH PRIVATE KEY-----
++b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABlwAAAAdzc2gtcn
++NhAAAAAwEAAQAAAYEApPG4MdkYQKD57/qreFrh9GRC22y66qZOWZWRjC887rrbvBzO69hV
++yJpTIXleJEvpWiHYcjMR5G6NNFsnNtZ4fxDqmSc4vcFj53JsE/XNqLKq6psXadCb5vkNpG
++bxA+Z5bJlzJ969PgJIIEbgc86sei4kgR2MuPWqtZbY5GkpNCTqWuLYeFK+14oFruA2nyWH
++9MOIRDHK/d597psHy+LTMtymO7ZPhO571abKw6jvvwiSeDxVE9kV7KAQIuM9/S3gftvgQQ
++ron3GL34pgmIabdSGdbfHqGDooryJhlbquJZELBN236KgRNTCAjVvUzjjQr1eRP3xssGwV
++O6ECBGCQLl/aYogAgtwnwj9iXqtfiLK3EwlgjquU4+JQ0CVtLhG3gIZB+qoMThco0pmHTr
++jtfQCwrztsBBFunSa2/CstuV1mQ5O5ZrZ6ACo9yPRBNkns6+CiKdtMtCtzi3k2RDz9jpYm
++Pcak03Lr7IkdC1Tp6+jA+//yPHSO1o4CqW89IQzNAAAFgEUd7lZFHe5WAAAAB3NzaC1yc2
++EAAAGBAKTxuDHZGECg+e/6q3ha4fRkQttsuuqmTlmVkYwvPO6627wczuvYVciaUyF5XiRL
++6Voh2HIzEeRujTRbJzbWeH8Q6pknOL3BY+dybBP1zaiyquqbF2nQm+b5DaRm8QPmeWyZcy
++fevT4CSCBG4HPOrHouJIEdjLj1qrWW2ORpKTQk6lri2HhSvteKBa7gNp8lh/TDiEQxyv3e
++fe6bB8vi0zLcpju2T4Tue9WmysOo778Ikng8VRPZFeygECLjPf0t4H7b4EEK6J9xi9+KYJ
++iGm3UhnW3x6hg6KK8iYZW6riWRCwTdt+ioETUwgI1b1M440K9XkT98bLBsFTuhAgRgkC5f
++2mKIAILcJ8I/Yl6rX4iytxMJYI6rlOPiUNAlbS4Rt4CGQfqqDE4XKNKZh0647X0AsK87bA
++QRbp0mtvwrLbldZkOTuWa2egAqPcj0QTZJ7OvgoinbTLQrc4t5NkQ8/Y6WJj3GpNNy6+yJ
++HQtU6evowPv/8jx0jtaOAqlvPSEMzQAAAAMBAAEAAAGAGaqbdPZJNdVWzyb8g6/wtSzc0n
++Qq6dSTIJGLonq/So69HpqFAGIbhymsger24UMGvsXBfpO/1wH06w68HWZmPa+OMeLOi4iK
++WTuO4dQ/+l5DBlq32/lgKSLcIpb6LhcxEdsW9j9Mx1dnjc45owun/yMq/wRwH1/q/nLIsV
++JD3R9ZcGcYNDD8DWIm3D17gmw+qbG7hJES+0oh4n0xS2KyZpm7LFOEMDVEA8z+hE/HbryQ
++vjD1NC91n+qQWD1wKfN3WZDRwip3z1I5VHMpvXrA/spHpa9gzHK5qXNmZSz3/dfA1zHjCR
++2dHjJnrIUH8nyPfw8t+COC+sQBL3Nr0KUWEFPRM08cOcQm4ctzg17aDIZBONjlZGKlReR8
++1zfAw84Q70q2spLWLBLXSFblHkaOfijEbejIbaz2UUEQT27WD7RHAORdQlkx7eitk66T9d
++DzIq/cpYhm5Fs8KZsh3PLldp9nsHbD2Oa9J9LJyI4ryuIW0mVwRdvPSiiYi3K+mDCpAAAA
++wBe+ugEEJ+V7orb1f4Zez0Bd4FNkEc52WZL4CWbaCtM+ZBg5KnQ6xW14JdC8IS9cNi/I5P
++yLsBvG4bWPLGgQruuKY6oLueD6BFnKjqF6ACUCiSQldh4BAW1nYc2U48+FFvo3ZQyudFSy
++QEFlhHmcaNMDo0AIJY5Xnq2BG3nEX7AqdtZ8hhenHwLCRQJatDwSYBHDpSDdh9vpTnGp/2
++0jBz25Ko4UANzvSAc3sA4yN3jfpoM366TgdNf8x3g1v7yljQAAAMEA0HSQjzH5nhEwB58k
++mYYxnBYp1wb86zIuVhAyjZaeinvBQSTmLow8sXIHcCVuD3CgBezlU2SX5d9YuvRU9rcthi
++uzn4wWnbnzYy4SwzkMJXchUAkumFVD8Hq5TNPh2Z+033rLLE08EhYypSeVpuzdpFoStaS9
++3DUZA2bR/zLZI9MOVZRUcYImNegqIjOYHY8Sbj3/0QPV6+WpUJFMPvvedWhfaOsRMTA6nr
++VLG4pxkrieVl0UtuRGbzD/exXhXVi7AAAAwQDKkJj4ez/+KZFYlZQKiV0BrfUFcgS6ElFM
++2CZIEagCtu8eedrwkNqx2FUX33uxdvUTr4c9I3NvWeEEGTB9pgD4lh1x/nxfuhyGXtimFM
++GnznGV9oyz0DmKlKiKSEGwWf5G+/NiiCwwVJ7wsQQm7TqNtkQ9b8MhWWXC7xlXKUs7dmTa
++e8AqAndCCMEnbS1UQFO/R5PNcZXkFWDggLQ/eWRYKlrXgdnUgH6h0saOcViKpNJBUXb3+x
++eauhOY52PS/BcAAAAKamFtZXNAbmV3dAE=
++-----END OPENSSH PRIVATE KEY-----
+diff --git a/tests/integration_tests/assets/keys/id_rsa.test3.pub b/tests/integration_tests/assets/keys/id_rsa.test3.pub
+new file mode 100644
+index 00000000..057db632
+--- /dev/null
++++ b/tests/integration_tests/assets/keys/id_rsa.test3.pub
+@@ -0,0 +1 @@
++ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCk8bgx2RhAoPnv+qt4WuH0ZELbbLrqpk5ZlZGMLzzuutu8HM7r2FXImlMheV4kS+laIdhyMxHkbo00Wyc21nh/EOqZJzi9wWPncmwT9c2osqrqmxdp0Jvm+Q2kZvED5nlsmXMn3r0+AkggRuBzzqx6LiSBHYy49aq1ltjkaSk0JOpa4th4Ur7XigWu4DafJYf0w4hEMcr93n3umwfL4tMy3KY7tk+E7nvVpsrDqO+/CJJ4PFUT2RXsoBAi4z39LeB+2+BBCuifcYvfimCYhpt1IZ1t8eoYOiivImGVuq4lkQsE3bfoqBE1MICNW9TOONCvV5E/fGywbBU7oQIEYJAuX9piiACC3CfCP2Jeq1+IsrcTCWCOq5Tj4lDQJW0uEbeAhkH6qgxOFyjSmYdOuO19ALCvO2wEEW6dJrb8Ky25XWZDk7lmtnoAKj3I9EE2Sezr4KIp20y0K3OLeTZEPP2OliY9xqTTcuvsiR0LVOnr6MD7//I8dI7WjgKpbz0hDM0= test3@host
+diff --git a/tests/integration_tests/modules/test_ssh_keysfile.py b/tests/integration_tests/modules/test_ssh_keysfile.py
+new file mode 100644
+index 00000000..f82d7649
+--- /dev/null
++++ b/tests/integration_tests/modules/test_ssh_keysfile.py
+@@ -0,0 +1,85 @@
++import paramiko
++import pytest
++from io import StringIO
++from paramiko.ssh_exception import SSHException
++
++from tests.integration_tests.instances import IntegrationInstance
++from tests.integration_tests.util import get_test_rsa_keypair
++
++TEST_USER1_KEYS = get_test_rsa_keypair('test1')
++TEST_USER2_KEYS = get_test_rsa_keypair('test2')
++TEST_DEFAULT_KEYS = get_test_rsa_keypair('test3')
++
++USERDATA = """\
++#cloud-config
++bootcmd:
++ - sed -i 's;#AuthorizedKeysFile.*;AuthorizedKeysFile /etc/ssh/authorized_keys %h/.ssh/authorized_keys2;' /etc/ssh/sshd_config
++ssh_authorized_keys:
++ - {default}
++users:
++- default
++- name: test_user1
++  ssh_authorized_keys:
++    - {user1}
++- name: test_user2
++  ssh_authorized_keys:
++    - {user2}
++""".format(  # noqa: E501
++    default=TEST_DEFAULT_KEYS.public_key,
++    user1=TEST_USER1_KEYS.public_key,
++    user2=TEST_USER2_KEYS.public_key,
++)
++
++
++@pytest.mark.ubuntu
++@pytest.mark.user_data(USERDATA)
++def test_authorized_keys(client: IntegrationInstance):
++    expected_keys = [
++        ('test_user1', '/home/test_user1/.ssh/authorized_keys2',
++         TEST_USER1_KEYS),
++        ('test_user2', '/home/test_user2/.ssh/authorized_keys2',
++         TEST_USER2_KEYS),
++        ('ubuntu', '/home/ubuntu/.ssh/authorized_keys2',
++         TEST_DEFAULT_KEYS),
++        ('root', '/root/.ssh/authorized_keys2', TEST_DEFAULT_KEYS),
++    ]
++
++    for user, filename, keys in expected_keys:
++        contents = client.read_from_file(filename)
++        if user in ['ubuntu', 'root']:
++            # Our personal public key gets added by pycloudlib
++            lines = contents.split('\n')
++            assert len(lines) == 2
++            assert keys.public_key.strip() in contents
++        else:
++            assert contents.strip() == keys.public_key.strip()
++
++        # Ensure we can actually connect
++        ssh = paramiko.SSHClient()
++        ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
++        paramiko_key = paramiko.RSAKey.from_private_key(StringIO(
++            keys.private_key))
++
++        # Will fail with AuthenticationException if
++        # we cannot connect
++        ssh.connect(
++            client.instance.ip,
++            username=user,
++            pkey=paramiko_key,
++            look_for_keys=False,
++            allow_agent=False,
++        )
++
++        # Ensure other uses can't connect using our key
++        other_users = [u[0] for u in expected_keys if u[2] != keys]
++        for other_user in other_users:
++            with pytest.raises(SSHException):
++                print('trying to connect as {} with key from {}'.format(
++                    other_user, user))
++                ssh.connect(
++                    client.instance.ip,
++                    username=other_user,
++                    pkey=paramiko_key,
++                    look_for_keys=False,
++                    allow_agent=False,
++                )
+diff --git a/tests/unittests/test_sshutil.py b/tests/unittests/test_sshutil.py
+index fd1d1bac..bcb8044f 100644
+--- a/tests/unittests/test_sshutil.py
++++ b/tests/unittests/test_sshutil.py
+@@ -570,20 +570,33 @@ class TestBasicAuthorizedKeyParse(test_helpers.CiTestCase):
+             ssh_util.render_authorizedkeysfile_paths(
+                 "%h/.keys", "/homedirs/bobby", "bobby"))
+ 
++    def test_all(self):
++        self.assertEqual(
++            ["/homedirs/bobby/.keys", "/homedirs/bobby/.secret/keys",
++             "/keys/path1", "/opt/bobby/keys"],
++            ssh_util.render_authorizedkeysfile_paths(
++                "%h/.keys .secret/keys /keys/path1 /opt/%u/keys",
++                "/homedirs/bobby", "bobby"))
++
+ 
+ class TestMultipleSshAuthorizedKeysFile(test_helpers.CiTestCase):
+ 
+     @patch("cloudinit.ssh_util.pwd.getpwnam")
+     def test_multiple_authorizedkeys_file_order1(self, m_getpwnam):
+-        fpw = FakePwEnt(pw_name='bobby', pw_dir='/home2/bobby')
++        fpw = FakePwEnt(pw_name='bobby', pw_dir='/tmp/home2/bobby')
+         m_getpwnam.return_value = fpw
+-        authorized_keys = self.tmp_path('authorized_keys')
++        user_ssh_folder = "%s/.ssh" % fpw.pw_dir
++
++        # /tmp/home2/bobby/.ssh/authorized_keys = rsa
++        authorized_keys = self.tmp_path('authorized_keys', dir=user_ssh_folder)
+         util.write_file(authorized_keys, VALID_CONTENT['rsa'])
+ 
+-        user_keys = self.tmp_path('user_keys')
++        # /tmp/home2/bobby/.ssh/user_keys = dsa
++        user_keys = self.tmp_path('user_keys', dir=user_ssh_folder)
+         util.write_file(user_keys, VALID_CONTENT['dsa'])
+ 
+-        sshd_config = self.tmp_path('sshd_config')
++        # /tmp/sshd_config
++        sshd_config = self.tmp_path('sshd_config', dir="/tmp")
+         util.write_file(
+             sshd_config,
+             "AuthorizedKeysFile %s %s" % (authorized_keys, user_keys)
+@@ -593,33 +606,244 @@ class TestMultipleSshAuthorizedKeysFile(test_helpers.CiTestCase):
+             fpw.pw_name, sshd_config)
+         content = ssh_util.update_authorized_keys(auth_key_entries, [])
+ 
+-        self.assertEqual("%s/.ssh/authorized_keys" % fpw.pw_dir, auth_key_fn)
++        self.assertEqual(user_keys, auth_key_fn)
+         self.assertTrue(VALID_CONTENT['rsa'] in content)
+         self.assertTrue(VALID_CONTENT['dsa'] in content)
+ 
+     @patch("cloudinit.ssh_util.pwd.getpwnam")
+     def test_multiple_authorizedkeys_file_order2(self, m_getpwnam):
+-        fpw = FakePwEnt(pw_name='suzie', pw_dir='/home/suzie')
++        fpw = FakePwEnt(pw_name='suzie', pw_dir='/tmp/home/suzie')
+         m_getpwnam.return_value = fpw
+-        authorized_keys = self.tmp_path('authorized_keys')
++        user_ssh_folder = "%s/.ssh" % fpw.pw_dir
++
++        # /tmp/home/suzie/.ssh/authorized_keys = rsa
++        authorized_keys = self.tmp_path('authorized_keys', dir=user_ssh_folder)
+         util.write_file(authorized_keys, VALID_CONTENT['rsa'])
+ 
+-        user_keys = self.tmp_path('user_keys')
++        # /tmp/home/suzie/.ssh/user_keys = dsa
++        user_keys = self.tmp_path('user_keys', dir=user_ssh_folder)
+         util.write_file(user_keys, VALID_CONTENT['dsa'])
+ 
+-        sshd_config = self.tmp_path('sshd_config')
++        # /tmp/sshd_config
++        sshd_config = self.tmp_path('sshd_config', dir="/tmp")
+         util.write_file(
+             sshd_config,
+-            "AuthorizedKeysFile %s %s" % (authorized_keys, user_keys)
++            "AuthorizedKeysFile %s %s" % (user_keys, authorized_keys)
+         )
+ 
+         (auth_key_fn, auth_key_entries) = ssh_util.extract_authorized_keys(
+-            fpw.pw_name, sshd_config
++            fpw.pw_name, sshd_config)
++        content = ssh_util.update_authorized_keys(auth_key_entries, [])
++
++        self.assertEqual(authorized_keys, auth_key_fn)
++        self.assertTrue(VALID_CONTENT['rsa'] in content)
++        self.assertTrue(VALID_CONTENT['dsa'] in content)
++
++    @patch("cloudinit.ssh_util.pwd.getpwnam")
++    def test_multiple_authorizedkeys_file_local_global(self, m_getpwnam):
++        fpw = FakePwEnt(pw_name='bobby', pw_dir='/tmp/home2/bobby')
++        m_getpwnam.return_value = fpw
++        user_ssh_folder = "%s/.ssh" % fpw.pw_dir
++
++        # /tmp/home2/bobby/.ssh/authorized_keys = rsa
++        authorized_keys = self.tmp_path('authorized_keys', dir=user_ssh_folder)
++        util.write_file(authorized_keys, VALID_CONTENT['rsa'])
++
++        # /tmp/home2/bobby/.ssh/user_keys = dsa
++        user_keys = self.tmp_path('user_keys', dir=user_ssh_folder)
++        util.write_file(user_keys, VALID_CONTENT['dsa'])
++
++        # /tmp/etc/ssh/authorized_keys = ecdsa
++        authorized_keys_global = self.tmp_path('etc/ssh/authorized_keys',
++                                               dir="/tmp")
++        util.write_file(authorized_keys_global, VALID_CONTENT['ecdsa'])
++
++        # /tmp/sshd_config
++        sshd_config = self.tmp_path('sshd_config', dir="/tmp")
++        util.write_file(
++            sshd_config,
++            "AuthorizedKeysFile %s %s %s" % (authorized_keys_global,
++                                             user_keys, authorized_keys)
++        )
++
++        (auth_key_fn, auth_key_entries) = ssh_util.extract_authorized_keys(
++            fpw.pw_name, sshd_config)
++        content = ssh_util.update_authorized_keys(auth_key_entries, [])
++
++        self.assertEqual(authorized_keys, auth_key_fn)
++        self.assertTrue(VALID_CONTENT['rsa'] in content)
++        self.assertTrue(VALID_CONTENT['ecdsa'] in content)
++        self.assertTrue(VALID_CONTENT['dsa'] in content)
++
++    @patch("cloudinit.ssh_util.pwd.getpwnam")
++    def test_multiple_authorizedkeys_file_local_global2(self, m_getpwnam):
++        fpw = FakePwEnt(pw_name='bobby', pw_dir='/tmp/home2/bobby')
++        m_getpwnam.return_value = fpw
++        user_ssh_folder = "%s/.ssh" % fpw.pw_dir
++
++        # /tmp/home2/bobby/.ssh/authorized_keys2 = rsa
++        authorized_keys = self.tmp_path('authorized_keys2',
++                                        dir=user_ssh_folder)
++        util.write_file(authorized_keys, VALID_CONTENT['rsa'])
++
++        # /tmp/home2/bobby/.ssh/user_keys3 = dsa
++        user_keys = self.tmp_path('user_keys3', dir=user_ssh_folder)
++        util.write_file(user_keys, VALID_CONTENT['dsa'])
++
++        # /tmp/etc/ssh/authorized_keys = ecdsa
++        authorized_keys_global = self.tmp_path('etc/ssh/authorized_keys',
++                                               dir="/tmp")
++        util.write_file(authorized_keys_global, VALID_CONTENT['ecdsa'])
++
++        # /tmp/sshd_config
++        sshd_config = self.tmp_path('sshd_config', dir="/tmp")
++        util.write_file(
++            sshd_config,
++            "AuthorizedKeysFile %s %s %s" % (authorized_keys_global,
++                                             authorized_keys, user_keys)
++        )
++
++        (auth_key_fn, auth_key_entries) = ssh_util.extract_authorized_keys(
++            fpw.pw_name, sshd_config)
++        content = ssh_util.update_authorized_keys(auth_key_entries, [])
++
++        self.assertEqual(user_keys, auth_key_fn)
++        self.assertTrue(VALID_CONTENT['rsa'] in content)
++        self.assertTrue(VALID_CONTENT['ecdsa'] in content)
++        self.assertTrue(VALID_CONTENT['dsa'] in content)
++
++    @patch("cloudinit.ssh_util.pwd.getpwnam")
++    def test_multiple_authorizedkeys_file_global(self, m_getpwnam):
++        fpw = FakePwEnt(pw_name='bobby', pw_dir='/tmp/home2/bobby')
++        m_getpwnam.return_value = fpw
++
++        # /tmp/etc/ssh/authorized_keys = rsa
++        authorized_keys_global = self.tmp_path('etc/ssh/authorized_keys',
++                                               dir="/tmp")
++        util.write_file(authorized_keys_global, VALID_CONTENT['rsa'])
++
++        # /tmp/sshd_config
++        sshd_config = self.tmp_path('sshd_config')
++        util.write_file(
++            sshd_config,
++            "AuthorizedKeysFile %s" % (authorized_keys_global)
+         )
++
++        (auth_key_fn, auth_key_entries) = ssh_util.extract_authorized_keys(
++            fpw.pw_name, sshd_config)
+         content = ssh_util.update_authorized_keys(auth_key_entries, [])
+ 
+         self.assertEqual("%s/.ssh/authorized_keys" % fpw.pw_dir, auth_key_fn)
+         self.assertTrue(VALID_CONTENT['rsa'] in content)
++
++    @patch("cloudinit.ssh_util.pwd.getpwnam")
++    def test_multiple_authorizedkeys_file_multiuser(self, m_getpwnam):
++        fpw = FakePwEnt(pw_name='bobby', pw_dir='/tmp/home2/bobby')
++        m_getpwnam.return_value = fpw
++        user_ssh_folder = "%s/.ssh" % fpw.pw_dir
++        # /tmp/home2/bobby/.ssh/authorized_keys2 = rsa
++        authorized_keys = self.tmp_path('authorized_keys2',
++                                        dir=user_ssh_folder)
++        util.write_file(authorized_keys, VALID_CONTENT['rsa'])
++        # /tmp/home2/bobby/.ssh/user_keys3 = dsa
++        user_keys = self.tmp_path('user_keys3', dir=user_ssh_folder)
++        util.write_file(user_keys, VALID_CONTENT['dsa'])
++
++        fpw2 = FakePwEnt(pw_name='suzie', pw_dir='/tmp/home/suzie')
++        user_ssh_folder = "%s/.ssh" % fpw2.pw_dir
++        # /tmp/home/suzie/.ssh/authorized_keys2 = ssh-xmss@openssh.com
++        authorized_keys2 = self.tmp_path('authorized_keys2',
++                                         dir=user_ssh_folder)
++        util.write_file(authorized_keys2,
++                        VALID_CONTENT['ssh-xmss@openssh.com'])
++
++        # /tmp/etc/ssh/authorized_keys = ecdsa
++        authorized_keys_global = self.tmp_path('etc/ssh/authorized_keys2',
++                                               dir="/tmp")
++        util.write_file(authorized_keys_global, VALID_CONTENT['ecdsa'])
++
++        # /tmp/sshd_config
++        sshd_config = self.tmp_path('sshd_config', dir="/tmp")
++        util.write_file(
++            sshd_config,
++            "AuthorizedKeysFile %s %%h/.ssh/authorized_keys2 %s" %
++            (authorized_keys_global, user_keys)
++        )
++
++        # process first user
++        (auth_key_fn, auth_key_entries) = ssh_util.extract_authorized_keys(
++            fpw.pw_name, sshd_config)
++        content = ssh_util.update_authorized_keys(auth_key_entries, [])
++
++        self.assertEqual(user_keys, auth_key_fn)
++        self.assertTrue(VALID_CONTENT['rsa'] in content)
++        self.assertTrue(VALID_CONTENT['ecdsa'] in content)
++        self.assertTrue(VALID_CONTENT['dsa'] in content)
++        self.assertFalse(VALID_CONTENT['ssh-xmss@openssh.com'] in content)
++
++        m_getpwnam.return_value = fpw2
++        # process second user
++        (auth_key_fn, auth_key_entries) = ssh_util.extract_authorized_keys(
++            fpw2.pw_name, sshd_config)
++        content = ssh_util.update_authorized_keys(auth_key_entries, [])
++
++        self.assertEqual(authorized_keys2, auth_key_fn)
++        self.assertTrue(VALID_CONTENT['ssh-xmss@openssh.com'] in content)
++        self.assertTrue(VALID_CONTENT['ecdsa'] in content)
++        self.assertTrue(VALID_CONTENT['dsa'] in content)
++        self.assertFalse(VALID_CONTENT['rsa'] in content)
++
++    @patch("cloudinit.ssh_util.pwd.getpwnam")
++    def test_multiple_authorizedkeys_file_multiuser2(self, m_getpwnam):
++        fpw = FakePwEnt(pw_name='bobby', pw_dir='/tmp/home/bobby')
++        m_getpwnam.return_value = fpw
++        user_ssh_folder = "%s/.ssh" % fpw.pw_dir
++        # /tmp/home/bobby/.ssh/authorized_keys2 = rsa
++        authorized_keys = self.tmp_path('authorized_keys2',
++                                        dir=user_ssh_folder)
++        util.write_file(authorized_keys, VALID_CONTENT['rsa'])
++        # /tmp/home/bobby/.ssh/user_keys3 = dsa
++        user_keys = self.tmp_path('user_keys3', dir=user_ssh_folder)
++        util.write_file(user_keys, VALID_CONTENT['dsa'])
++
++        fpw2 = FakePwEnt(pw_name='badguy', pw_dir='/tmp/home/badguy')
++        user_ssh_folder = "%s/.ssh" % fpw2.pw_dir
++        # /tmp/home/badguy/home/bobby = ""
++        authorized_keys2 = self.tmp_path('home/bobby', dir="/tmp/home/badguy")
++
++        # /tmp/etc/ssh/authorized_keys = ecdsa
++        authorized_keys_global = self.tmp_path('etc/ssh/authorized_keys2',
++                                               dir="/tmp")
++        util.write_file(authorized_keys_global, VALID_CONTENT['ecdsa'])
++
++        # /tmp/sshd_config
++        sshd_config = self.tmp_path('sshd_config', dir="/tmp")
++        util.write_file(
++            sshd_config,
++            "AuthorizedKeysFile %s %%h/.ssh/authorized_keys2 %s %s" %
++            (authorized_keys_global, user_keys, authorized_keys2)
++        )
++
++        # process first user
++        (auth_key_fn, auth_key_entries) = ssh_util.extract_authorized_keys(
++            fpw.pw_name, sshd_config)
++        content = ssh_util.update_authorized_keys(auth_key_entries, [])
++
++        self.assertEqual(user_keys, auth_key_fn)
++        self.assertTrue(VALID_CONTENT['rsa'] in content)
++        self.assertTrue(VALID_CONTENT['ecdsa'] in content)
++        self.assertTrue(VALID_CONTENT['dsa'] in content)
++
++        m_getpwnam.return_value = fpw2
++        # process second user
++        (auth_key_fn, auth_key_entries) = ssh_util.extract_authorized_keys(
++            fpw2.pw_name, sshd_config)
++        content = ssh_util.update_authorized_keys(auth_key_entries, [])
++
++        # badguy should not take the key from the other user!
++        self.assertEqual(authorized_keys2, auth_key_fn)
++        self.assertTrue(VALID_CONTENT['ecdsa'] in content)
+         self.assertTrue(VALID_CONTENT['dsa'] in content)
++        self.assertFalse(VALID_CONTENT['rsa'] in content)
+ 
+ # vi: ts=4 expandtab
+-- 
+2.27.0
+

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
-

SOURCES/ci-write-passwords-only-to-serial-console-lock-down-clo.patch

@@ -0,0 +1,369 @@
+From 769b9f8c9b1ecc294a197575108ae7cb54ad7f4b Mon Sep 17 00:00:00 2001
+From: Eduardo Otubo <otubo@redhat.com>
+Date: Mon, 5 Jul 2021 14:13:45 +0200
+Subject: [PATCH] write passwords only to serial console, lock down
+ cloud-init-output.log (#847)
+
+RH-Author: Eduardo Otubo <otubo@redhat.com>
+RH-MergeRequest: 21: write passwords only to serial console, lock down cloud-init-output.log (#847)
+RH-Commit: [1/1] 8f30f2b7d0d6f9dca19994dbd0827b44e998f238 (otubo/cloud-init)
+RH-Bugzilla: 1945891
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Acked-by: Mohamed Gamal Morsy <mmorsy@redhat.com>
+
+commit b794d426b9ab43ea9d6371477466070d86e10668
+Author: Daniel Watkins <oddbloke@ubuntu.com>
+Date:   Fri Mar 19 10:06:42 2021 -0400
+
+    write passwords only to serial console, lock down cloud-init-output.log (#847)
+
+    Prior to this commit, when a user specified configuration which would
+    generate random passwords for users, cloud-init would cause those
+    passwords to be written to the serial console by emitting them on
+    stderr.  In the default configuration, any stdout or stderr emitted by
+    cloud-init is also written to `/var/log/cloud-init-output.log`.  This
+    file is world-readable, meaning that those randomly-generated passwords
+    were available to be read by any user with access to the system.  This
+    presents an obvious security issue.
+
+    This commit responds to this issue in two ways:
+
+    * We address the direct issue by moving from writing the passwords to
+      sys.stderr to writing them directly to /dev/console (via
+      util.multi_log); this means that the passwords will never end up in
+      cloud-init-output.log
+    * To avoid future issues like this, we also modify the logging code so
+      that any files created in a log sink subprocess will only be
+      owner/group readable and, if it exists, will be owned by the adm
+      group.  This results in `/var/log/cloud-init-output.log` no longer
+      being world-readable, meaning that if there are other parts of the
+      codebase that are emitting sensitive data intended for the serial
+      console, that data is no longer available to all users of the system.
+
+    LP: #1918303
+
+Signed-off-by: Eduardo Otubo <otubo@redhat.com>
+---
+ cloudinit/config/cc_set_passwords.py          |  5 +-
+ cloudinit/config/tests/test_set_passwords.py  | 40 +++++++++----
+ cloudinit/tests/test_util.py                  | 56 +++++++++++++++++++
+ cloudinit/util.py                             | 38 +++++++++++--
+ .../modules/test_set_password.py              | 24 ++++++++
+ tests/integration_tests/test_logging.py       | 22 ++++++++
+ tests/unittests/test_util.py                  |  4 ++
+ 7 files changed, 173 insertions(+), 16 deletions(-)
+ create mode 100644 tests/integration_tests/test_logging.py
+
+diff --git a/cloudinit/config/cc_set_passwords.py b/cloudinit/config/cc_set_passwords.py
+index d6b5682d..433de751 100755
+--- a/cloudinit/config/cc_set_passwords.py
++++ b/cloudinit/config/cc_set_passwords.py
+@@ -78,7 +78,6 @@ password.
+ """
+ 
+ import re
+-import sys
+ 
+ from cloudinit.distros import ug_util
+ from cloudinit import log as logging
+@@ -214,7 +213,9 @@ def handle(_name, cfg, cloud, log, args):
+         if len(randlist):
+             blurb = ("Set the following 'random' passwords\n",
+                      '\n'.join(randlist))
+-            sys.stderr.write("%s\n%s\n" % blurb)
++            util.multi_log(
++                "%s\n%s\n" % blurb, stderr=False, fallback_to_stdout=False
++            )
+ 
+         if expire:
+             expired_users = []
+diff --git a/cloudinit/config/tests/test_set_passwords.py b/cloudinit/config/tests/test_set_passwords.py
+index daa1ef51..bbe2ee8f 100644
+--- a/cloudinit/config/tests/test_set_passwords.py
++++ b/cloudinit/config/tests/test_set_passwords.py
+@@ -74,10 +74,6 @@ class TestSetPasswordsHandle(CiTestCase):
+ 
+     with_logs = True
+ 
+-    def setUp(self):
+-        super(TestSetPasswordsHandle, self).setUp()
+-        self.add_patch('cloudinit.config.cc_set_passwords.sys.stderr', 'm_err')
+-
+     def test_handle_on_empty_config(self, *args):
+         """handle logs that no password has changed when config is empty."""
+         cloud = self.tmp_cloud(distro='ubuntu')
+@@ -129,10 +125,12 @@ class TestSetPasswordsHandle(CiTestCase):
+             mock.call(['pw', 'usermod', 'ubuntu', '-p', '01-Jan-1970'])],
+             m_subp.call_args_list)
+ 
++    @mock.patch(MODPATH + "util.multi_log")
+     @mock.patch(MODPATH + "util.is_BSD")
+     @mock.patch(MODPATH + "subp.subp")
+-    def test_handle_on_chpasswd_list_creates_random_passwords(self, m_subp,
+-                                                              m_is_bsd):
++    def test_handle_on_chpasswd_list_creates_random_passwords(
++        self, m_subp, m_is_bsd, m_multi_log
++    ):
+         """handle parses command set random passwords."""
+         m_is_bsd.return_value = False
+         cloud = self.tmp_cloud(distro='ubuntu')
+@@ -146,10 +144,32 @@ class TestSetPasswordsHandle(CiTestCase):
+         self.assertIn(
+             'DEBUG: Handling input for chpasswd as list.',
+             self.logs.getvalue())
+-        self.assertNotEqual(
+-            [mock.call(['chpasswd'],
+-             '\n'.join(valid_random_pwds) + '\n')],
+-            m_subp.call_args_list)
++
++        self.assertEqual(1, m_subp.call_count)
++        args, _kwargs = m_subp.call_args
++        self.assertEqual(["chpasswd"], args[0])
++
++        stdin = args[1]
++        user_pass = {
++            user: password
++            for user, password
++            in (line.split(":") for line in stdin.splitlines())
++        }
++
++        self.assertEqual(1, m_multi_log.call_count)
++        self.assertEqual(
++            mock.call(mock.ANY, stderr=False, fallback_to_stdout=False),
++            m_multi_log.call_args
++        )
++
++        self.assertEqual(set(["root", "ubuntu"]), set(user_pass.keys()))
++        written_lines = m_multi_log.call_args[0][0].splitlines()
++        for password in user_pass.values():
++            for line in written_lines:
++                if password in line:
++                    break
++            else:
++                self.fail("Password not emitted to console")
+ 
+ 
+ # vi: ts=4 expandtab
+diff --git a/cloudinit/tests/test_util.py b/cloudinit/tests/test_util.py
+index b7a302f1..e811917e 100644
+--- a/cloudinit/tests/test_util.py
++++ b/cloudinit/tests/test_util.py
+@@ -851,4 +851,60 @@ class TestEnsureFile:
+         assert "ab" == kwargs["omode"]
+ 
+ 
++@mock.patch("cloudinit.util.grp.getgrnam")
++@mock.patch("cloudinit.util.os.setgid")
++@mock.patch("cloudinit.util.os.umask")
++class TestRedirectOutputPreexecFn:
++    """This tests specifically the preexec_fn used in redirect_output."""
++
++    @pytest.fixture(params=["outfmt", "errfmt"])
++    def preexec_fn(self, request):
++        """A fixture to gather the preexec_fn used by redirect_output.
++
++        This enables simpler direct testing of it, and parameterises any tests
++        using it to cover both the stdout and stderr code paths.
++        """
++        test_string = "| piped output to invoke subprocess"
++        if request.param == "outfmt":
++            args = (test_string, None)
++        elif request.param == "errfmt":
++            args = (None, test_string)
++        with mock.patch("cloudinit.util.subprocess.Popen") as m_popen:
++            util.redirect_output(*args)
++
++        assert 1 == m_popen.call_count
++        _args, kwargs = m_popen.call_args
++        assert "preexec_fn" in kwargs, "preexec_fn not passed to Popen"
++        return kwargs["preexec_fn"]
++
++    def test_preexec_fn_sets_umask(
++        self, m_os_umask, _m_setgid, _m_getgrnam, preexec_fn
++    ):
++        """preexec_fn should set a mask that avoids world-readable files."""
++        preexec_fn()
++
++        assert [mock.call(0o037)] == m_os_umask.call_args_list
++
++    def test_preexec_fn_sets_group_id_if_adm_group_present(
++        self, _m_os_umask, m_setgid, m_getgrnam, preexec_fn
++    ):
++        """We should setgrp to adm if present, so files are owned by them."""
++        fake_group = mock.Mock(gr_gid=mock.sentinel.gr_gid)
++        m_getgrnam.return_value = fake_group
++
++        preexec_fn()
++
++        assert [mock.call("adm")] == m_getgrnam.call_args_list
++        assert [mock.call(mock.sentinel.gr_gid)] == m_setgid.call_args_list
++
++    def test_preexec_fn_handles_absent_adm_group_gracefully(
++        self, _m_os_umask, m_setgid, m_getgrnam, preexec_fn
++    ):
++        """We should handle an absent adm group gracefully."""
++        m_getgrnam.side_effect = KeyError("getgrnam(): name not found: 'adm'")
++
++        preexec_fn()
++
++        assert 0 == m_setgid.call_count
++
+ # vi: ts=4 expandtab
+diff --git a/cloudinit/util.py b/cloudinit/util.py
+index 769f3425..4e0a72db 100644
+--- a/cloudinit/util.py
++++ b/cloudinit/util.py
+@@ -359,7 +359,7 @@ def find_modules(root_dir):
+ 
+ 
+ def multi_log(text, console=True, stderr=True,
+-              log=None, log_level=logging.DEBUG):
++              log=None, log_level=logging.DEBUG, fallback_to_stdout=True):
+     if stderr:
+         sys.stderr.write(text)
+     if console:
+@@ -368,7 +368,7 @@ def multi_log(text, console=True, stderr=True,
+             with open(conpath, 'w') as wfh:
+                 wfh.write(text)
+                 wfh.flush()
+-        else:
++        elif fallback_to_stdout:
+             # A container may lack /dev/console (arguably a container bug).  If
+             # it does not exist, then write output to stdout.  this will result
+             # in duplicate stderr and stdout messages if stderr was True.
+@@ -623,6 +623,26 @@ def redirect_output(outfmt, errfmt, o_out=None, o_err=None):
+     if not o_err:
+         o_err = sys.stderr
+ 
++    # pylint: disable=subprocess-popen-preexec-fn
++    def set_subprocess_umask_and_gid():
++        """Reconfigure umask and group ID to create output files securely.
++
++        This is passed to subprocess.Popen as preexec_fn, so it is executed in
++        the context of the newly-created process.  It:
++
++        * sets the umask of the process so created files aren't world-readable
++        * if an adm group exists in the system, sets that as the process' GID
++          (so that the created file(s) are owned by root:adm)
++        """
++        os.umask(0o037)
++        try:
++            group_id = grp.getgrnam("adm").gr_gid
++        except KeyError:
++            # No adm group, don't set a group
++            pass
++        else:
++            os.setgid(group_id)
++
+     if outfmt:
+         LOG.debug("Redirecting %s to %s", o_out, outfmt)
+         (mode, arg) = outfmt.split(" ", 1)
+@@ -632,7 +652,12 @@ def redirect_output(outfmt, errfmt, o_out=None, o_err=None):
+                 owith = "wb"
+             new_fp = open(arg, owith)
+         elif mode == "|":
+-            proc = subprocess.Popen(arg, shell=True, stdin=subprocess.PIPE)
++            proc = subprocess.Popen(
++                arg,
++                shell=True,
++                stdin=subprocess.PIPE,
++                preexec_fn=set_subprocess_umask_and_gid,
++            )
+             new_fp = proc.stdin
+         else:
+             raise TypeError("Invalid type for output format: %s" % outfmt)
+@@ -654,7 +679,12 @@ def redirect_output(outfmt, errfmt, o_out=None, o_err=None):
+                 owith = "wb"
+             new_fp = open(arg, owith)
+         elif mode == "|":
+-            proc = subprocess.Popen(arg, shell=True, stdin=subprocess.PIPE)
++            proc = subprocess.Popen(
++                arg,
++                shell=True,
++                stdin=subprocess.PIPE,
++                preexec_fn=set_subprocess_umask_and_gid,
++            )
+             new_fp = proc.stdin
+         else:
+             raise TypeError("Invalid type for error format: %s" % errfmt)
+diff --git a/tests/integration_tests/modules/test_set_password.py b/tests/integration_tests/modules/test_set_password.py
+index b13f76fb..d7cf91a5 100644
+--- a/tests/integration_tests/modules/test_set_password.py
++++ b/tests/integration_tests/modules/test_set_password.py
+@@ -116,6 +116,30 @@ class Mixin:
+         # Which are not the same
+         assert shadow_users["harry"] != shadow_users["dick"]
+ 
++    def test_random_passwords_not_stored_in_cloud_init_output_log(
++        self, class_client
++    ):
++        """We should not emit passwords to the in-instance log file.
++
++        LP: #1918303
++        """
++        cloud_init_output = class_client.read_from_file(
++            "/var/log/cloud-init-output.log"
++        )
++        assert "dick:" not in cloud_init_output
++        assert "harry:" not in cloud_init_output
++
++    def test_random_passwords_emitted_to_serial_console(self, class_client):
++        """We should emit passwords to the serial console. (LP: #1918303)"""
++        try:
++            console_log = class_client.instance.console_log()
++        except NotImplementedError:
++            # Assume that an exception here means that we can't use the console
++            # log
++            pytest.skip("NotImplementedError when requesting console log")
++        assert "dick:" in console_log
++        assert "harry:" in console_log
++
+     def test_explicit_password_set_correctly(self, class_client):
+         """Test that an explicitly-specified password is set correctly."""
+         shadow_users, _ = self._fetch_and_parse_etc_shadow(class_client)
+diff --git a/tests/integration_tests/test_logging.py b/tests/integration_tests/test_logging.py
+new file mode 100644
+index 00000000..b31a0434
+--- /dev/null
++++ b/tests/integration_tests/test_logging.py
+@@ -0,0 +1,22 @@
++"""Integration tests relating to cloud-init's logging."""
++
++
++class TestVarLogCloudInitOutput:
++    """Integration tests relating to /var/log/cloud-init-output.log."""
++
++    def test_var_log_cloud_init_output_not_world_readable(self, client):
++        """
++        The log can contain sensitive data, it shouldn't be world-readable.
++
++        LP: #1918303
++        """
++        # Check the file exists
++        assert client.execute("test -f /var/log/cloud-init-output.log").ok
++
++        # Check its permissions are as we expect
++        perms, user, group = client.execute(
++            "stat -c %a:%U:%G /var/log/cloud-init-output.log"
++        ).split(":")
++        assert "640" == perms
++        assert "root" == user
++        assert "adm" == group
+diff --git a/tests/unittests/test_util.py b/tests/unittests/test_util.py
+index 857629f1..e5292001 100644
+--- a/tests/unittests/test_util.py
++++ b/tests/unittests/test_util.py
+@@ -572,6 +572,10 @@ class TestMultiLog(helpers.FilesystemMockingTestCase):
+         util.multi_log(logged_string)
+         self.assertEqual(logged_string, self.stdout.getvalue())
+ 
++    def test_logs_dont_go_to_stdout_if_fallback_to_stdout_is_false(self):
++        util.multi_log('something', fallback_to_stdout=False)
++        self.assertEqual('', self.stdout.getvalue())
++
+     def test_logs_go_to_log_if_given(self):
+         log = mock.MagicMock()
+         logged_string = 'something very important'
+-- 
+2.27.0
+

SOURCES/cloud-init-20.3-add_almalinux.patch

@@ -0,0 +1,185 @@
+From deccb70fbd4d0cf759732c6a59357f74ae1558e4 Mon Sep 17 00:00:00 2001
+From: Andrew Lukoshko <andrew.lukoshko@gmail.com>
+Date: Wed, 7 Apr 2021 23:50:49 +0300
+Subject: [PATCH] Add AlmaLinux OS support
+
+---
+ cloudinit/config/cc_ntp.py          | 4 ++--
+ cloudinit/config/cc_yum_add_repo.py | 4 ++--
+ cloudinit/distros/__init__.py       | 2 +-
+ cloudinit/distros/almalinux.py      | 9 +++++++++
+ cloudinit/net/sysconfig.py          | 2 +-
+ cloudinit/util.py                   | 4 ++--
+ config/cloud.cfg.tmpl               | 6 +++---
+ systemd/cloud-init-generator.tmpl   | 2 +-
+ systemd/cloud-init.service.tmpl     | 2 +-
+ tools/.github-cla-signers           | 1 +
+ tools/render-cloudcfg               | 4 ++--
+ 11 files changed, 25 insertions(+), 15 deletions(-)
+ create mode 100644 cloudinit/distros/almalinux.py
+
+diff --git a/cloudinit/config/cc_ntp.py b/cloudinit/config/cc_ntp.py
+index e183993f1d..41c278ffad 100644
+--- a/cloudinit/config/cc_ntp.py
++++ b/cloudinit/config/cc_ntp.py
+@@ -24,8 +24,8 @@
+ frequency = PER_INSTANCE
+ NTP_CONF = '/etc/ntp.conf'
+ NR_POOL_SERVERS = 4
+-distros = ['alpine', 'centos', 'debian', 'fedora', 'opensuse', 'rhel',
+-           'sles', 'ubuntu']
++distros = ['almalinux', 'alpine', 'centos', 'debian', 'fedora', 'opensuse',
++           'rhel', 'sles', 'ubuntu']
+ 
+ NTP_CLIENT_CONFIG = {
+     'chrony': {
+diff --git a/cloudinit/config/cc_yum_add_repo.py b/cloudinit/config/cc_yum_add_repo.py
+index 01fe683cd1..db513ed7dc 100644
+--- a/cloudinit/config/cc_yum_add_repo.py
++++ b/cloudinit/config/cc_yum_add_repo.py
+@@ -18,7 +18,7 @@
+ 
+ **Module frequency:** per always
+ 
+-**Supported distros:** centos, fedora, rhel
++**Supported distros:** almalinux, centos, fedora, rhel
+ 
+ **Config keys**::
+ 
+@@ -36,7 +36,7 @@
+ 
+ from cloudinit import util
+ 
+-distros = ['centos', 'fedora', 'rhel']
++distros = ['almalinux', 'centos', 'fedora', 'rhel']
+ 
+ 
+ def _canonicalize_id(repo_id):
+diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py
+index 220bd11f2c..2e1200c087 100755
+--- a/cloudinit/distros/__init__.py
++++ b/cloudinit/distros/__init__.py
+@@ -46,7 +46,7 @@
+     'debian': ['debian', 'ubuntu'],
+     'freebsd': ['freebsd'],
+     'gentoo': ['gentoo'],
+-    'redhat': ['amazon', 'centos', 'fedora', 'rhel'],
++    'redhat': ['almalinux', 'amazon', 'centos', 'fedora', 'rhel'],
+     'suse': ['opensuse', 'sles'],
+ }
+ 
+diff --git a/cloudinit/distros/almalinux.py b/cloudinit/distros/almalinux.py
+new file mode 100644
+index 0000000000..edb3165d2e
+--- /dev/null
++++ b/cloudinit/distros/almalinux.py
+@@ -0,0 +1,9 @@
++# This file is part of cloud-init. See LICENSE file for license information.
++
++from cloudinit.distros import rhel
++
++
++class Distro(rhel.Distro):
++    pass
++
++# vi: ts=4 expandtab
+diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
+index 99a4bae459..d732854d0c 100644
+--- a/cloudinit/net/sysconfig.py
++++ b/cloudinit/net/sysconfig.py
+@@ -19,7 +19,7 @@
+ 
+ LOG = logging.getLogger(__name__)
+ NM_CFG_FILE = "/etc/NetworkManager/NetworkManager.conf"
+-KNOWN_DISTROS = ['centos', 'fedora', 'rhel', 'suse']
++KNOWN_DISTROS = ['almalinux', 'centos', 'fedora', 'rhel', 'suse']
+ 
+ 
+ def _make_header(sep='#'):
+diff --git a/cloudinit/util.py b/cloudinit/util.py
+index 4e0a72db86..fdea1181c0 100644
+--- a/cloudinit/util.py
++++ b/cloudinit/util.py
+@@ -521,8 +521,8 @@ def system_info():
+     if system == "linux":
+         linux_dist = info['dist'][0].lower()
+         if linux_dist in (
+-                'alpine', 'arch', 'centos', 'debian', 'fedora', 'rhel',
+-                'suse'):
++                'almalinux', 'alpine', 'arch', 'centos', 'debian', 'fedora',
++                'rhel', 'suse'):
+             var = linux_dist
+         elif linux_dist in ('ubuntu', 'linuxmint', 'mint'):
+             var = 'ubuntu'
+diff --git a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl
+index 7171aaa514..8656daa72b 100644
+--- a/config/cloud.cfg.tmpl
++++ b/config/cloud.cfg.tmpl
+@@ -21,7 +21,7 @@ disable_root: false
+ disable_root: true
+ {% endif %}
+ 
+-{% if variant in ["alpine", "amazon", "centos", "fedora", "rhel"] %}
++{% if variant in ["almalinux", "alpine", "amazon", "centos", "fedora", "rhel"] %}
+ mount_default_fields: [~, ~, 'auto', 'defaults,nofail', '0', '2']
+ {% if variant == "amazon" %}
+ resize_rootfs: noblock
+@@ -153,7 +153,7 @@ cloud_final_modules:
+ # (not accessible to handlers/transforms)
+ system_info:
+    # This will affect which distro class gets used
+-{% if variant in ["alpine", "amazon", "arch", "centos", "debian",
++{% if variant in ["almalinux", "alpine", "amazon", "arch", "centos", "debian",
+                   "fedora", "freebsd", "netbsd", "openbsd", "rhel",
+                   "suse", "ubuntu"] %}
+    distro: {{ variant }}
+@@ -206,7 +206,7 @@ system_info:
+          primary: http://ports.ubuntu.com/ubuntu-ports
+          security: http://ports.ubuntu.com/ubuntu-ports
+    ssh_svcname: ssh
+-{% elif variant in ["alpine", "amazon", "arch", "centos", "fedora",
++{% elif variant in ["almalinux", "alpine", "amazon", "arch", "centos", "fedora",
+                     "rhel", "suse"] %}
+    # Default user name + that default users groups (if added/used)
+    default_user:
+diff --git a/systemd/cloud-init-generator.tmpl b/systemd/cloud-init-generator.tmpl
+index 0773356bb6..9b103ef983 100755
+--- a/systemd/cloud-init-generator.tmpl
++++ b/systemd/cloud-init-generator.tmpl
+@@ -83,7 +83,7 @@ default() {
+ 
+ check_for_datasource() {
+     local ds_rc=""
+-{% if variant in ["rhel", "fedora", "centos"] %}
++{% if variant in ["almalinux", "rhel", "fedora", "centos"] %}
+     local dsidentify="/usr/libexec/cloud-init/ds-identify"
+ {% else %}
+     local dsidentify="/usr/lib/cloud-init/ds-identify"
+diff --git a/systemd/cloud-init.service.tmpl b/systemd/cloud-init.service.tmpl
+index f140344db5..a5c5127715 100644
+--- a/systemd/cloud-init.service.tmpl
++++ b/systemd/cloud-init.service.tmpl
+@@ -10,7 +10,7 @@ After=systemd-networkd-wait-online.service
+ {% if variant in ["ubuntu", "unknown", "debian"] %}
+ After=networking.service
+ {% endif %}
+-{% if variant in ["centos", "fedora", "rhel"] %}
++{% if variant in ["almalinux", "centos", "fedora", "rhel"] %}
+ After=network.service
+ After=NetworkManager.service
+ {% endif %}
+diff --git a/tools/render-cloudcfg b/tools/render-cloudcfg
+index ed4548400d..f599074801 100755
+--- a/tools/render-cloudcfg
++++ b/tools/render-cloudcfg
+@@ -4,8 +4,8 @@ import argparse
+ import os
+ import sys
+ 
+-VARIANTS = ["alpine", "amazon", "arch", "centos", "debian", "fedora",
+-            "freebsd", "netbsd", "openbsd", "rhel", "suse", "ubuntu",
++VARIANTS = ["almalinux", "alpine", "amazon", "arch", "centos", "debian",
++            "fedora", "freebsd", "netbsd", "openbsd", "rhel", "suse", "ubuntu",
+             "unknown"]
+ 
+ 

SPECS/cloud-init.spec

@@ -5,58 +5,58 @@
 %global debug_package %{nil}
 
 Name:           cloud-init
-Version:        23.4
+Version:        21.1
-Release:        7%{?dist}.8
+Release:        7%{?dist}.5.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
-Patch0004: 0004-include-NOZEROCONF-yes-in-etc-sysconfig-network.patch
+Patch0002: 0002-Do-not-write-NM_CONTROLLED-no-in-generated-interface.patch
-Patch0005: 0005-settings.py-update-settings-for-rhel.patch
+Patch0003: 0003-limit-permissions-on-def_log_file.patch
-Patch0013: 0013-rhel-cloud.cfg-remove-ssh_genkeytypes-in-settings.py.patch
+Patch0004: 0004-sysconfig-Don-t-write-BOOTPROTO-dhcp-for-ipv6-dhcp.patch
-# For RHEL-7277 - [RFE] [Azure][RHEL8][Network][cloud-init] Can not acquire IPv6 address
+Patch0005: 0005-DataSourceAzure.py-use-hostnamectl-to-set-hostname.patch
-Patch14: ci-net-network_manager-do-not-set-may-fail-to-False-for.patch
+Patch0006: 0006-include-NOZEROCONF-yes-in-etc-sysconfig-network.patch
-# For RHEL-7277 - [RFE] [Azure][RHEL8][Network][cloud-init] Can not acquire IPv6 address
+Patch0007: 0007-Remove-race-condition-between-cloud-init-and-Network.patch
-Patch15: ci-net-allow-dhcp6-configuration-from-generate_fallback.patch
+Patch0008: 0008-net-exclude-OVS-internal-interfaces-in-get_interface.patch
-# For RHEL-17610 - [RHEL-8] NetworkManagerActivator brings up interface failed when using sysconfig renderer
+Patch0009: 0009-Fix-requiring-device-number-on-EC2-derivatives-836.patch
-Patch16: ci-net-nm-check-for-presence-of-ifcfg-files-when-nm-con.patch
+# For bz#1957532 - [cloud-init] From RHEL 82+ cloud-init no longer displays sshd keys fingerprints from instance launched from a backup image
-# For RHEL-21530 - [RHEL-8.10]subp.py[WARNING]: skipping /etc/cloud/clean.d/README when do cloud-init clean
+Patch10: ci-rhel-cloud.cfg-remove-ssh_genkeytypes-in-settings.py.patch
-Patch17: ci-fix-clean-stop-warning-when-running-clean-command-47.patch
+# For bz#1945891 - CVE-2021-3429 cloud-init: randomly generated passwords logged in clear-text to world-readable file [rhel-8]
-# For RHEL-21530 - [RHEL-8.10]subp.py[WARNING]: skipping /etc/cloud/clean.d/README when do cloud-init clean
+Patch11: ci-write-passwords-only-to-serial-console-lock-down-clo.patch
-Patch18: ci-test-jsonschema-Pin-jsonschema-version-4781.patch
+# For bz#1862967 - [cloud-init]Customize ssh AuthorizedKeysFile causes login failure
-# For RHEL-22248 - [Azure][RHEL-8] cloud-init-23.4 cannot read "- Azure" datasource_list format
+Patch12: ci-ssh-util-allow-cloudinit-to-merge-all-ssh-keys-into-.patch
-Patch19: ci-Revert-Use-grep-for-faster-parsing-of-cloud-config-i.patch
+# For bz#1862967 - [cloud-init]Customize ssh AuthorizedKeysFile causes login failure
-# For RHEL-21323 - [rhel-8] The schema WARNING info for network-config.json is not suitable in cloud-init-23.4
+Patch13: ci-Stop-copying-ssh-system-keys-and-check-folder-permis.patch
-Patch20: ci-ci-Pin-pytest-8.0.0.-4816.patch
+# For bz#1995840 - [cloudinit]  Fix home permissions modified by ssh module
-# For RHEL-21323 - [rhel-8] The schema WARNING info for network-config.json is not suitable in cloud-init-23.4
+Patch14: ci-Fix-home-permissions-modified-by-ssh-module-SC-338-9.patch
-Patch21: ci-fix-Add-types-to-network-v1-schema-4841.patch
+# For bz#2017697 - cloud-init fails to set host key permissions correctly [rhel-8.5.0.z]
-# For RHEL-21290 - Unknown lvalue 'ConditionEnvironment' in section 'Unit' for /usr/lib/systemd/system/cloud-init.target,cloud-init.service
+Patch15: ci-cc_ssh.py-fix-private-key-group-owner-and-permission.patch
-Patch22: ci-Revert-systemd-Standardize-cloud-init-systemd-enable.patch
+# For bz#2028738 - cloud-init.service fails to start after package update [rhel-8.5.0.z]
-# For RHEL-28817 - [RHEL 8.10] cloud-init 23.4 returns 2 on recoverable errors instead of 0
+Patch16: ci-fix-error-on-upgrade-caused-by-new-vendordata2-attri.patch
-Patch23: ci-Retain-exit-code-in-cloud-init-status-for-recoverabl.patch
+# For bz#2028756 - [RHEL-8] Above 19.2 of cloud-init fails to configure routes when configuring static and default routes to the same destination IP [rhel-8.5.0.z]
-# For RHEL-27134 - [rhel-8]cloud-init fails to configure DNS/search domains for network-config v1
+Patch17: ci-cloudinit-net-handle-two-different-routes-for-the-sa.patch
-Patch24: ci-fix-Correct-v2-NetworkManager-route-rendering-4637.patch
+# For bz#2040690 - [RHEL8] [Azure] cloud-init fails to configure the system [rhel-8.5.0.z]
-# For RHEL-27134 - [rhel-8]cloud-init fails to configure DNS/search domains for network-config v1
+#Patch18: ci-Add-gdisk-and-openssl-as-deps-to-fix-UEFI-Azure-init.patch
-Patch25: ci-feat-apply-global-DNS-to-interfaces-in-network-manag.patch
+# For bz#2040704 - [cloud-init][RHEL8] Support for cloud-init datasource 'cloud-init-vmware-guestinfo' [rhel-8.5.0.z]
-# For RHEL-29710 - Suggest to backport patch ff40d1a to undeprecate 'network' in schema route definition [rhel-8.10.0.z]
+Patch19: ci-Datasource-for-VMware-953.patch
-Patch26: ci-fix-Undeprecate-network-in-schema-route-definition-5.patch
+# For bz#2040704 - [cloud-init][RHEL8] Support for cloud-init datasource 'cloud-init-vmware-guestinfo' [rhel-8.5.0.z]
-# For RHEL-32841 - [cloud-init][ESXi]VMware datasource resets on every boot causing it to lose network configuration [rhel-8.10.z]
+Patch20: ci-Change-netifaces-dependency-to-0.10.4-965.patch
-Patch27: ci-fix-Fall-back-to-cached-local-ds-if-no-valid-ds-foun.patch
+# For bz#2040704 - [cloud-init][RHEL8] Support for cloud-init datasource 'cloud-init-vmware-guestinfo' [rhel-8.5.0.z]
-# For RHEL-36701 - DataSourceNoCloudNet not configurable via config files [rhel-8.10.z]
+Patch21: ci-Update-dscheck_VMware-s-rpctool-check-970.patch
-Patch28: ci-fix-Always-use-single-datasource-if-specified-5098.patch
+# For bz#2040704 - [cloud-init][RHEL8] Support for cloud-init datasource 'cloud-init-vmware-guestinfo' [rhel-8.5.0.z]
-# For RHEL-40418 - [Cloud-init] CloudstackDataSource cannot work with NetworkManager [rhel-8.10.z]
+Patch22: ci-Revert-unnecesary-lcase-in-ds-identify-978.patch
-Patch29: ci-fix-cloudstack-Use-parsed-lease-file-for-virtual-rou.patch
+# For bz#2060026 - cloud-init writes route6-$DEVICE config with a HEX netmask. ip route does not like : Error: inet6 prefix is expected rather than "fd00:fd00:fd00::/ffff:ffff:ffff:ffff::". [rhel-8.5.0.z]
-# For RHEL-46013 - [RHEL-8] cloud-init fails to configure DNS search domains [rhel-8.10.z]
+Patch23: ci-Fix-IPv6-netmask-format-for-sysconfig-1215.patch
-Patch30: ci-feat-sysconfig-Add-DNS-from-interface-config-to-reso.patch
+# For bz#2040704 - [cloud-init][RHEL8] Support for cloud-init datasource 'cloud-init-vmware-guestinfo' [rhel-8.5.0.z]
-# For RHEL-49742 - [Cloud-init] [RHEL-8.10] Password reset feature broken with CloudstackDataSource
+#Patch23: ci-Add-netifaces-package-as-a-Requires-in-cloud-init.sp.patch
-Patch31: ci-fix-Clean-cache-if-no-datasource-fallback-5499.patch
+
-# For RHEL-54155 - [RHEL 8.10] cloud-init schema validation fails.
+# AlmaLinux patches
-Patch32: ci-fix-Add-subnet-ipv4-ipv6-to-network-schema-5191.patch
+Patch100: cloud-init-20.3-add_almalinux.patch
 
 BuildArch:      noarch
 
@@ -105,7 +105,7 @@ Requires:       shadow-utils
 Requires:       util-linux
 Requires:       xfsprogs
 Requires:       dhcp-client
-# https://bugzilla.redhat.com/show_bug.cgi?id=2039697
+# https://bugzilla.redhat.com/show_bug.cgi?id=2040690
 Requires:       gdisk
 Requires:       openssl
 Requires:       python3-netifaces
@@ -132,6 +132,8 @@ sed -i -e 's|#!/usr/bin/env python|#!/usr/bin/env python3|' \
 %install
 %py3_install --
 
+python3 tools/render-cloudcfg --variant fedora > $RPM_BUILD_ROOT/%{_sysconfdir}/cloud/cloud.cfg
+
 sed -i "s,@@PACKAGED_VERSION@@,%{version}-%{release}," $RPM_BUILD_ROOT/%{python3_sitelib}/cloudinit/version.py
 
 mkdir -p $RPM_BUILD_ROOT/var/lib/cloud
@@ -141,14 +143,27 @@ mkdir -p $RPM_BUILD_ROOT/run/cloud-init
 mkdir -p $RPM_BUILD_ROOT/%{_tmpfilesdir}
 cp -p %{SOURCE1} $RPM_BUILD_ROOT/%{_tmpfilesdir}/%{name}.conf
 
+# We supply our own config file since our software differs from Ubuntu's.
+cp -p rhel/cloud.cfg $RPM_BUILD_ROOT/%{_sysconfdir}/cloud/cloud.cfg
+
 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
+
+# Install our own systemd units (rhbz#1440831)
+mkdir -p $RPM_BUILD_ROOT%{_unitdir}
+cp rhel/systemd/* $RPM_BUILD_ROOT%{_unitdir}/
 
 [ ! -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
 
+[ ! -d $RPM_BUILD_ROOT/usr/lib/%{name} ] && mkdir -p $RPM_BUILD_ROOT/usr/lib/%{name}
+cp -p tools/ds-identify $RPM_BUILD_ROOT%{_libexecdir}/%{name}/ds-identify
+
 # installing man pages
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1/
 for man in cloud-id.1 cloud-init.1 cloud-init-per.1; do
@@ -170,27 +185,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,23 +217,9 @@ 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
+%doc ChangeLog rhel/README.rhel
 %config(noreplace) %{_sysconfdir}/cloud/cloud.cfg
 %dir               %{_sysconfdir}/cloud/cloud.cfg.d
 %config(noreplace) %{_sysconfdir}/cloud/cloud.cfg.d/*.cfg
@@ -248,8 +229,6 @@ fi
 %{_unitdir}/cloud-config.service
 %{_unitdir}/cloud-config.target
 %{_unitdir}/cloud-final.service
-%{_unitdir}/cloud-init-hotplugd.service
-%{_unitdir}/cloud-init-hotplugd.socket
 %{_unitdir}/cloud-init-local.service
 %{_unitdir}/cloud-init.service
 %{_unitdir}/cloud-init.target
@@ -261,273 +240,52 @@ fi
 %{_mandir}/man1/*
 %dir %verify(not mode) /run/cloud-init
 %dir /var/lib/cloud
+/etc/NetworkManager/dispatcher.d/cloud-init-azure-hook
 %{_udevrulesdir}/66-azure-ephemeral.rules
-%{_datadir}/bash-completion/completions/cloud-init
+%{_sysconfdir}/bash_completion.d/cloud-init
 %{_bindir}/cloud-id
+%{_libexecdir}/%{name}/ds-identify
 /usr/lib/systemd/system-generators/cloud-init-generator
-%{_sysconfdir}/systemd/system/sshd-keygen@.service.d/disable-sshd-keygen-if-cloud-init-active.conf
 
 
 %dir %{_sysconfdir}/rsyslog.d
 %config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf
 
 %changelog
-* Tue Aug 20 2024 Jon Maloy <jmaloy@redhat.com> - 23.4-7.el8_10.8
+* Tue Apr 26 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 21.1-7.el8_5.5.alma
-- ci-fix-Add-subnet-ipv4-ipv6-to-network-schema-5191.patch [RHEL-54155]
+- 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
+* Thu Mar 03 2022 Jon Maloy <jmaloy@redhat.com> - 21.1-7.el8_5.5
-- ci-fix-Clean-cache-if-no-datasource-fallback-5499.patch [RHEL-49742]
+- ci-Fix-IPv6-netmask-format-for-sysconfig-1215.patch [bz#2060026]
-- Resolves: RHEL-49742
+- Resolves: bz#2060026
-  ([Cloud-init] [RHEL-8.10] Password reset feature broken with CloudstackDataSource)
+  (cloud-init writes route6-$DEVICE config with a HEX netmask. ip route does not like : Error: inet6 prefix is expected rather than "fd00:fd00:fd00::/ffff:ffff:ffff:ffff::". [rhel-8.5.0.z])
 
-* Tue Jul 09 2024 Jon Maloy <jmaloy@redhat.com> - 23.4-7.el8_10.6
+* Wed Jan 19 2022 Jon Maloy <jmaloy@redhat.com> - 21.1-7.el8_5.4
-- ci-feat-sysconfig-Add-DNS-from-interface-config-to-reso.patch [RHEL-46013]
+- ci-Add-gdisk-and-openssl-as-deps-to-fix-UEFI-Azure-init.patch [bz#2040690]
-- Resolves: RHEL-46013
+- ci-Datasource-for-VMware-953.patch [bz#2040704]
-  ([RHEL-8] cloud-init fails to configure DNS search domains [rhel-8.10.z])
+- ci-Change-netifaces-dependency-to-0.10.4-965.patch [bz#2040704]
+- ci-Update-dscheck_VMware-s-rpctool-check-970.patch [bz#2040704]
+- ci-Revert-unnecesary-lcase-in-ds-identify-978.patch [bz#2040704]
+- ci-Add-netifaces-package-as-a-Requires-in-cloud-init.sp.patch [bz#2040704]
+- Resolves: bz#2040690
+  ([RHEL8] [Azure] cloud-init fails to configure the system [rhel-8.5.0.z])
+- Resolves: bz#2040704
+  ([cloud-init][RHEL8] Support for cloud-init datasource 'cloud-init-vmware-guestinfo' [rhel-8.5.0.z])
 
-* Tue Jul 09 2024 Miroslav Rezanina <mrezanin@redhat.com> - 23.4-7.el8_10.5
+* Wed Dec 08 2021 Jon Maloy <jmaloy@redhat.com> - 21.1-7.el8_5.3
-- ci-fix-cloudstack-Use-parsed-lease-file-for-virtual-rou.patch [RHEL-40418]
+- ci-cloudinit-net-handle-two-different-routes-for-the-sa.patch [bz#2028756]
-- Resolves: RHEL-40418
+- Resolves: bz#2028756
-  ([Cloud-init] CloudstackDataSource cannot work with NetworkManager [rhel-8.10.z])
+  ([RHEL-8] Above 19.2 of cloud-init fails to configure routes when configuring static and default routes to the same destination IP [rhel-8.5.0.z])
 
-* Wed May 29 2024 Jon Maloy <jmaloy@redhat.com> - 23.4-7.el8.3
+* Mon Dec 06 2021 Jon Maloy <jmaloy@redhat.com> - 21.1-7.el8_5.2
-- ci-fix-Always-use-single-datasource-if-specified-5098.patch [RHEL-36701]
+- ci-fix-error-on-upgrade-caused-by-new-vendordata2-attri.patch [bz#2028738]
-- Resolves: RHEL-36701
+- Resolves: bz#2028738
-  (DataSourceNoCloudNet not configurable via config files [rhel-8.10.z])
+  (cloud-init.service fails to start after package update [rhel-8.5.0.z])
 
-* Tue Apr 23 2024 Miroslav Rezanina <mrezanin@redhat.com> - 23.4-7.el8_10.2
+* Tue Nov 02 2021 Miroslav Rezanina <mrezanin@redhat.com> - 21.1-7.el8_5.1
-- ci-fix-Fall-back-to-cached-local-ds-if-no-valid-ds-foun.patch [RHEL-32841]
+- ci-cc_ssh.py-fix-private-key-group-owner-and-permission.patch [bz#2017697]
-- Resolves: RHEL-32841
+- Resolves: bz#2017697
-  ([cloud-init][ESXi]VMware datasource resets on every boot causing it to lose network configuration [rhel-8.10.z])
+  (cloud-init fails to set host key permissions correctly [rhel-8.5.0.z])
-
-* Fri Apr 05 2024 Jon Maloy <jmaloy@redhat.com> - 23.4-7.el8.1
-- ci-fix-Correct-v2-NetworkManager-route-rendering-4637.patch [RHEL-27134]
-- ci-feat-apply-global-DNS-to-interfaces-in-network-manag.patch [RHEL-27134]
-- ci-fix-Undeprecate-network-in-schema-route-definition-5.patch [RHEL-29710]
-- Resolves: RHEL-27134
-  ([rhel-8]cloud-init fails to configure DNS/search domains for network-config v1)
-- Resolves: RHEL-29710
-  (Suggest to backport patch ff40d1a to undeprecate 'network' in schema route definition [rhel-8.10.0.z])
-
-* Thu Mar 14 2024 Miroslav Rezanina <mrezanin@redhat.com> - 23.4-7
-- ci-Retain-exit-code-in-cloud-init-status-for-recoverabl.patch [RHEL-28817]
-- Resolves: RHEL-28817
-  ([RHEL 8.10] cloud-init 23.4 returns 2 on recoverable errors instead of 0)
-
-* Mon Mar 11 2024 Miroslav Rezanina <mrezanin@redhat.com> - 23.4-6
-- ci-Revert-systemd-Standardize-cloud-init-systemd-enable.patch [RHEL-21290]
-- Resolves: RHEL-21290
-  (Unknown lvalue 'ConditionEnvironment' in section 'Unit' for /usr/lib/systemd/system/cloud-init.target,cloud-init.service)
-
-* Mon Feb 26 2024 Miroslav Rezanina <mrezanin@redhat.com> - 23.4-5
-- ci-ci-Pin-pytest-8.0.0.-4816.patch [RHEL-21323]
-- ci-fix-Add-types-to-network-v1-schema-4841.patch [RHEL-21323]
-- Resolves: RHEL-21323
-  ([rhel-8] The schema WARNING info for network-config.json is not suitable in cloud-init-23.4)
-
-* Fri Feb 02 2024 Jon Maloy <jmaloy@redhat.com> - 23.4-4
-- ci-Revert-Use-grep-for-faster-parsing-of-cloud-config-i.patch [RHEL-22248]
-- Resolves: RHEL-22248
-  ([Azure][RHEL-8] cloud-init-23.4 cannot read "- Azure" datasource_list format)
-
-* Fri Feb 02 2024 Jon Maloy <jmaloy@redhat.com> - 23.4-3
-- ci-fix-clean-stop-warning-when-running-clean-command-47.patch [RHEL-21530]
-- ci-test-jsonschema-Pin-jsonschema-version-4781.patch [RHEL-21530]
-- Resolves: RHEL-21530
-  ([RHEL-8.10]subp.py[WARNING]: skipping /etc/cloud/clean.d/README when do cloud-init clean)
-
-* Tue Jan 16 2024 Jon Maloy <jmaloy@redhat.com> - 23.4-2
-- ci-net-network_manager-do-not-set-may-fail-to-False-for.patch [RHEL-7277]
-- ci-net-allow-dhcp6-configuration-from-generate_fallback.patch [RHEL-7277]
-- ci-net-nm-check-for-presence-of-ifcfg-files-when-nm-con.patch [RHEL-17610]
-- Resolves: RHEL-7277
-  ([RFE] [Azure][RHEL8][Network][cloud-init] Can not acquire IPv6 address)
-- Resolves: RHEL-17610
-  ([RHEL-8] NetworkManagerActivator brings up interface failed when using sysconfig renderer)
-
-* Mon Jan 8 2024 Jon Maloy <jmaloy@redhat.com> - 23.4-1
-- Rebase to 23.4.1 [RHEL-18314]
-- Resolves: RHEL-18314
-  ([RHEL-8]Rebase cloud-init to 23.4)
-
-* Thu Nov 23 2023 Camilla Conte <cconte@redhat.com> - 23.1.1-12
-- ci-rhel-cloud.cfg-remove-ssh_genkeytypes-in-settings.py.patch [RHEL-16572]
-- Resolves: RHEL-16572
-  ([cloud-init][rhel-8] Backport the patch "rhel/cloud.cfg: remove ssh_genkeytypes in settings.py and set in cloud.cfg" to fix settings.py)
-
-* Mon Sep 18 2023 Camilla Conte <cconte@redhat.com> - 23.1.1-11
-- ci-net-fix-ipv6_dhcpv6_stateful-stateless-slaac-configu.patch [bz#2046491]
-- Resolves: bz#2046491
-  (cloud-init enable both DHCPv4 and DHCPv6 when network type is ipv6_dhcpv6-stateful/ipv6_dhcpv6-stateless)
-- Resolves: RHEL-2325
-  ([RHEL8.9][cloud-init] Not inform user during upgrade that cloud-init generated config files are left )
-
-* Fri Aug 25 2023 Camilla Conte <cconte@redhat.com> - 23.1.1-10
-- Resolves: bz#2233047
-  ([RHEL 8.9] Inform user when cloud-init generated config files are left during uninstalling)
-
-* Wed Aug 09 2023 Jon Maloy <jmaloy@redhat.com> - 23.1.1-9
-- ci-NM-renderer-set-default-IPv6-addr-gen-mode-for-all-i.patch [bz#2229460]
-- Resolves: bz#2229460
-  ([rhel-8.9] [RFE] Configure "ipv6.addr-gen-mode=eui64' as default in NetworkManager)
-
-* Thu Jul 27 2023 Camilla Conte <cconte@redhat.com> - 23.1.1-8
-- ci-DS-VMware-modify-a-few-log-level-4284.patch [bz#2223810]
-- Resolves: bz#2223810
-  ([cloud-init] [RHEL8.9]There are warning logs if dev has more than one IPV6 address on ESXi)
-
-* Tue Jul 25 2023 Miroslav Rezanina <mrezanin@redhat.com> - 23.1.1-7
-- ci-logging-keep-current-file-mode-of-log-file-if-its-st.patch [bz#2222501]
-- Resolves: bz#2222501
-  (Don't change log permissions if they are already more restrictive [rhel-8])
-
-* Mon Jul 10 2023 Miroslav Rezanina <mrezanin@redhat.com> - 23.1.1-6
-- ci-Revert-Manual-revert-Use-Network-Manager-and-Netplan.patch [bz#2219528]
-- ci-Revert-Revert-Add-native-NetworkManager-support-1224.patch [bz#2219528]
-- ci-nm-generate-ipv6-stateful-dhcp-config-at-par-with-sy.patch [bz#2219528]
-- ci-network_manager-add-a-method-for-ipv6-static-IP-conf.patch [bz#2219528]
-- ci-net-sysconfig-enable-sysconfig-renderer-if-network-m.patch [bz#2219528]
-- ci-network-manager-Set-higher-autoconnect-priority-for-.patch [bz#2219528]
-- ci-Set-default-renderer-as-sysconfig-for-centos-rhel-41.patch [bz#2219528]
-- Resolves: bz#2219528
-  ([RHEL8] Support configuring network by NM keyfiles)
-
-* Thu Jun 29 2023 Jon Maloy <jmaloy@redhat.com> - 23.1.1-4
-- ci-Add-warning-during-upgrade-from-an-old-version-with-.patch [bz#2210012]
-- Resolves: bz#2210012
-  ([cloud-init] System didn't generate ssh host keys and lost ssh connection after cloud-init removed them with updated cloud-init package.)
-
-* Wed May 03 2023 Jon Maloy <jmaloy@redhat.com> - 23.1.1-3
-- ci-Don-t-change-permissions-of-netrules-target-2076.patch [bz#2182947]
-- ci-Make-user-vendor-data-sensitive-and-remove-log-permi.patch [bz#2190081]
-- Resolves: bz#2182947
-  (Request to backport "Don't change permissions of netrules target (#2076)")
-- Resolves: bz#2190081
-  (CVE-2023-1786 cloud-init: sensitive data could be exposed in logs [rhel-8])
-
-* Tue Apr 25 2023 Jon Maloy <jmaloy@redhat.com> - 23.1.1-2
-- ci-rhel-make-sure-previous-hostname-file-ends-with-a-ne.patch [bz#2182407]
-- Resolves: bz#2182407
-  (cloud-init strips new line from "/etc/hostname" when processing "/var/lib/cloud/data/previous-hostname")
-
-* Fri Apr 21 2023 Jon Maloy <jmaloy@redhat.com> - 23.1.1-1
-- limit-permissions-on-def_log_file.patch
-- Resolves bz#1424612
-- include-NOZEROCONF-yes-in-etc-sysconfig-network.patch
-- Resolves bz#1653131
-- Rebase to 23.1.1 [bz#2172821]
-- Resolves: bz#2172821
-
-* Mon Jan 30 2023 Camilla Conte <cconte@redhat.com> - 22.1-8
-- ci-cc_set_hostname-ignore-var-lib-cloud-data-set-hostna.patch [bz#2162258]
-- Resolves: bz#2162258
-  (systemd[1]: Failed to start Initial cloud-init job after reboot system via sysrq 'b' [RHEL-8])
-
-* Wed Dec 28 2022 Camilla Conte <cconte@redhat.com> - 22.1-7
-- ci-Ensure-network-ready-before-cloud-init-service-runs-.patch [bz#2151861]
-- Resolves: bz#2151861
-  ([RHEL-8] Ensure network ready before cloud-init service runs on RHEL)
-
-* Mon Oct 17 2022 Jon Maloy <jmaloy@redhat.com> - 22.1-6
-- ci-cloud.cfg.tmpl-make-sure-centos-settings-are-identic.patch [bz#2115576]
-- Resolves: bz#2115576
-  (cloud-init configures user "centos" or "rhel" instead of "cloud-user" with cloud-init-22.1)
-
-* Wed Aug 17 2022 Jon Maloy <jmaloy@redhat.com> - 22.1-5
-- ci-Revert-Add-native-NetworkManager-support-1224.patch [bz#2107464 bz#2110066 bz#2117526 bz#2104393 bz#2098624]
-- ci-Revert-Use-Network-Manager-and-Netplan-as-default-re.patch [bz#2107464 bz#2110066 bz#2117526 bz#2104393 bz#2098624]
-- Resolves: bz#2107464
-  ([RHEL-8.7] Cannot run sysconfig when changing the priority of network renderers)
-- Resolves: bz#2110066
-  (DNS integration with OpenStack/cloud-init/NetworkManager is not working)
-- Resolves: bz#2117526
-  ([RHEL8.7] Revert patch of configuring networking by NM keyfiles)
-- Resolves: bz#2104393
-  ([RHEL-8.7]Failed to config static IP and IPv6 according to VMware Customization Config File)
-- Resolves: bz#2098624
-  ([RHEL-8.7] IPv6 not workable when cloud-init configure network using NM keyfiles)
-
-* Tue Jul 12 2022 Miroslav Rezanina <mrezanin@redhat.com> - 22.1-4
-- ci-cloud-init.spec-adjust-path-for-66-azure-ephemeral.r.patch [bz#2096269]
-- ci-setup.py-adjust-udev-rules-default-path-1513.patch [bz#2096269]
-- Resolves: bz#2096269
-  (Adjust udev/rules default path[RHEL-8])
-
-* Thu Jun 23 2022 Jon Maloy <jmaloy@redhat.com> - 22.1-3
-- ci-Support-EC2-tags-in-instance-metadata-1309.patch [bz#2082686]
-- Resolves: bz#2082686
-  ([cloud][init] Add support for reading tags from instance metadata)
-
-* Tue May 31 2022 Jon Maloy <jmaloy@redhat.com> - 22.1-2
-- ci-Add-native-NetworkManager-support-1224.patch [bz#2059872]
-- ci-Use-Network-Manager-and-Netplan-as-default-renderers.patch [bz#2059872]
-- ci-Align-rhel-custom-files-with-upstream-1431.patch [bz#2082071]
-- ci-Remove-rhel-specific-files.patch [bz#2082071]
-- Resolves: bz#2059872
-  ([RHEL-8]Rebase cloud-init from Fedora so it can configure networking using NM keyfiles)
-- Resolves: bz#2082071
-  (Align cloud.cfg file and systemd with cloud-init upstream .tmpl files)
-
-* Mon Apr 25 2022 Amy Chen <xiachen@redhat.com> - 22.1-1
-- Rebaes to 22.1 [bz#2065544]
-- Resolves: bz#2065544
-  ([RHEL-8.7.0] cloud-init rebase to 22.1)
-
-* Fri Apr 01 2022 Camilla Conte <cconte@redhat.com> - 21.1-15
-- ci-Detect-a-Python-version-change-and-clear-the-cache-8.patch [bz#1935826]
-- ci-Fix-MIME-policy-failure-on-python-version-upgrade-93.patch [bz#1935826]
-- Resolves: bz#1935826
-  ([rhel-8] Cloud-init init stage fails after upgrade from RHEL7 to RHEL8.)
-
-* Fri Feb 25 2022 Jon Maloy <jmaloy@redhat.com> - 21.1-14
-- ci-Fix-IPv6-netmask-format-for-sysconfig-1215.patch [bz#2046540]
-- Resolves: bz#2046540
-  (cloud-init writes route6-$DEVICE config with a HEX netmask. ip route does not like : Error: inet6 prefix is expected rather than "fd00:fd00:fd00::/ffff:ffff:ffff:ffff::".)
-
-* Tue Jan 25 2022 Jon Maloy <jmaloy@redhat.com> - 21.1-13
-- ci-Add-flexibility-to-IMDS-api-version-793.patch [bz#2023940]
-- ci-Azure-helper-Ensure-Azure-http-handler-sleeps-betwee.patch [bz#2023940]
-- ci-azure-Removing-ability-to-invoke-walinuxagent-799.patch [bz#2023940]
-- ci-Azure-eject-the-provisioning-iso-before-reporting-re.patch [bz#2023940]
-- ci-Azure-Retrieve-username-and-hostname-from-IMDS-865.patch [bz#2023940]
-- ci-Azure-Retry-net-metadata-during-nic-attach-for-non-t.patch [bz#2023940]
-- ci-Azure-adding-support-for-consuming-userdata-from-IMD.patch [bz#2023940]
-- Resolves: bz#2023940
-  ([RHEL-8] Support for provisioning Azure VM with userdata)
-
-* Wed Jan 19 2022 Jon Maloy <jmaloy@redhat.com> - 21.1-12
-- ci-Add-gdisk-and-openssl-as-deps-to-fix-UEFI-Azure-init.patch [bz#2039697]
-- ci-Datasource-for-VMware-953.patch [bz#2026587]
-- ci-Change-netifaces-dependency-to-0.10.4-965.patch [bz#2026587]
-- ci-Update-dscheck_VMware-s-rpctool-check-970.patch [bz#2026587]
-- ci-Revert-unnecesary-lcase-in-ds-identify-978.patch [bz#2026587]
-- ci-Add-netifaces-package-as-a-Requires-in-cloud-init.sp.patch [bz#2026587]
-- Resolves: bz#2039697
-  ([RHEL8] [Azure] cloud-init fails to configure the system)
-- Resolves: bz#2026587
-  ([cloud-init][RHEL8] Support for cloud-init datasource 'cloud-init-vmware-guestinfo')
-
-* Wed Dec 08 2021 Jon Maloy <jmaloy@redhat.com> - 21.1-11
-- ci-cloudinit-net-handle-two-different-routes-for-the-sa.patch [bz#2028028]
-- Resolves: bz#2028028
-  ([RHEL-8] Above 19.2 of cloud-init fails to configure routes when configuring static and default routes to the same destination IP)
-
-* Mon Dec 06 2021 Jon Maloy <jmaloy@redhat.com> - 21.1-10
-- ci-fix-error-on-upgrade-caused-by-new-vendordata2-attri.patch [bz#2021538]
-- Resolves: bz#2021538
-  (cloud-init.service fails to start after package update)
-
-* Mon Oct 25 2021 Jon Maloy <jmaloy@redhat.com> - 21.1-9
-- ci-cc_ssh.py-fix-private-key-group-owner-and-permission.patch [bz#2013644]
-- Resolves: bz#2013644
-  (cloud-init fails to set host key permissions correctly)
-
-* Thu Sep 23 2021 Miroslav Rezanina <mrezanin@redhat.com> - 21.1-8
-- ci-ssh_utils.py-ignore-when-sshd_config-options-are-not.patch [bz#1862933]
-- Resolves: bz#1862933
-  (cloud-init fails with ValueError: need more than 1 value to unpack[rhel-8])
 
 * Fri Aug 27 2021 Miroslav Rezanina <mrezanin@redhat.com> - 21.1-7
 - ci-Fix-home-permissions-modified-by-ssh-module-SC-338-9.patch [bz#1995840]
@@ -567,17 +325,6 @@ fi
 - Resolves: bz#1958174
   ([RHEL-8.5.0] Rebase cloud-init to 21.1)
 
-* Thu May 13 2021 Miroslav Rezanina <mrezanin@redhat.com> - 20.3-10.el8_4.3
-- ci-get_interfaces-don-t-exclude-Open-vSwitch-bridge-bon.patch [bz#1957135]
-- ci-net-exclude-OVS-internal-interfaces-in-get_interface.patch [bz#1957135]
-- Resolves: bz#1957135
-  (Intermittent failure to start cloud-init due to failure to detect macs [rhel-8.4.0.z])
-
-* Tue Apr 06 2021 Miroslav Rezanina <mrezanin@redhat.com> - 20.3-10.el8_4.1
-- ci-Fix-requiring-device-number-on-EC2-derivatives-836.patch [bz#1942699]
-- Resolves: bz#1942699
-  ([Aliyun][RHEL8.4][cloud-init] cloud-init service failed to start with Alibaba instance [rhel-8.4.0.z])
-
 * Tue Feb 02 2021 Miroslav Rezanina <mrezanin@redhat.com> - 20.3-10.el8
 - ci-fix-a-typo-in-man-page-cloud-init.1-752.patch [bz#1913127]
 - Resolves: bz#1913127