.cloud-init.metadata

@@ -1 +1 @@
-0b491818abcdce5ba6c1b30c75dd680d6ee3983e SOURCES/23.1.1.tar.gz
+830185bb5ce87ad86e4d1c0c62329bb255ec1648 SOURCES/cloud-init-22.1.tar.gz

.gitignore

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

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

@@ -1,61 +0,0 @@
-From c4d66915520554adedff9be7396f877cd1a5525c Mon Sep 17 00:00:00 2001
-From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-Date: Mon, 6 Mar 2023 16:37:20 +0100
-Subject: [PATCH] Add initial redhat changes
-
-Adding minimal set of changes necessary for successful build of the package
-on RHEL/CentOS 9 Stream koji.
-
-Merged patches (23.1.1):
-724a80ac  Add TargetRelease
-967a4405b rhel/cloud.cfg: remove ssh_genkeytypes in settings.py and set in cloud.cfg
-^ Merged since it removes hunks added in this commit itself
-
-Discarded because not needed anymore (packit):
-e3fd7ce12 Configure Packit to ignore the .gitignore file
-e18654e9  Fixes for packit support
-
-Discarded because file does not exist anymore and templates are aligned with upstream:
-3576b12460bf18557857ee25df6bf530dab66612 Adding _netdev to the default mount configuration
-8092b57ab245856ff1fdde1469960608a489c95e   Remove rhel specific files
-
-Added the following entry to %files to keep track of the new README file in config/clean.d/README
-%doc               %{_sysconfdir}/cloud/clean.d/README
-
-ignored
-c75e509b0 Revert "Revert "Setting highest autoconnect priority for network-scripts""
-0eba5c619 Revert "Setting highest autoconnect priority for network-scripts"
-
-ignored
-ba19343c0d9807d0c68a2d8e4ab274f3ca884247 Add Gitlab CI
-fe09305a5479a4814d6c46df07a906bafa29d637 Delete .gitlab-ci.yml
-
-Conflicts:
-missing rhel/ static files and "" instead of '' in setup.py
-
-Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
----
- cloudinit/settings.py | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/cloudinit/settings.py b/cloudinit/settings.py
-index 8684d003..edbb217d 100644
---- a/cloudinit/settings.py
-+++ b/cloudinit/settings.py
-@@ -53,13 +53,14 @@ CFG_BUILTIN = {
-     ],
-     "def_log_file": "/var/log/cloud-init.log",
-     "log_cfgs": [],
--    "syslog_fix_perms": ["syslog:adm", "root:adm", "root:wheel", "root:root"],
-+    "mount_default_fields": [None, None, "auto", "defaults,nofail", "0", "2"],
-+    "syslog_fix_perms": [],
-     "system_info": {
-         "paths": {
-             "cloud_dir": "/var/lib/cloud",
-             "templates_dir": "/etc/cloud/templates/",
-         },
--        "distro": "ubuntu",
-+        "distro": "rhel",
-         "network": {"renderers": None},
-     },
-     "vendor_data": {"enabled": True, "prefix": []},

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

@@ -0,0 +1,586 @@
+From 5e1e568d7085fd4443b4e3ccc492f5e31747e270 Mon Sep 17 00:00:00 2001
+From: Amy Chen <xiachen@redhat.com>
+Date: Wed, 20 Apr 2022 10:59:48 +0800
+Subject: Add initial redhat setup
+
+Merged patches (22.1)
+- d18029bf Add netifaces package as a Requires in cloud-init.spec.template
+- 31adf961 Add gdisk and openssl as deps to fix UEFI / Azure initialization
+- f4a2905d Add dhcp-client as a dependency
+- 290e14cc cloud-init.spec.template: update %systemd_postun parameter
+- 9be4ae9b (tag: cloud-init-21.1-1.el8) Update to cloud-init-21.1-1.el8
+
+Conflicts:
+cloudinit/config/cc_chef.py  Using double quotes instead of single quotes
+
+cloudinit/settings.py
+- Using rhel settings
+- Using double quotes instead of single quotes
+
+setup.py
+- Following the changes of 21.1 rebase
+- Using double quotes instead of single quotes
+
+redhat/cloud-init.spec.template
+- Add the drop-in to the right cloud-init.spec used by our package builder, which is downstream-only part of the bz 2002492 fix.
+
+redhat/Makefile.common
+- Backport the build handling fixes from patch "Update to cloud-init-21.1-1.el8"
+
+Signed-off-by: Amy Chen <xiachen@redhat.com>
+
+Merged patches (21.1):
+- 915d30ad Change gating file to correct rhel version
+- 311f318d Removing net-tools dependency
+- 74731806 Adding man pages to Red Hat spec file
+- 758d333d Removing blocking test from yaml configuration file
+- c7e7c59c Changing permission of cloud-init-generator to 755
+- 8b85abbb Installing man pages in the correct place with correct permissions
+- c6808d8d Fix unit failure of cloud-final.service if NetworkManager was not present.
+- 11866ef6 Report full specific version with "cloud-init --version"
+
+Rebase notes (18.5):
+- added bash_completition file
+- added cloud-id file
+
+Merged patches (20.3):
+- 01900d0 changing ds-identify patch from /usr/lib to /usr/libexec
+- 7f47ca3 Render the generator from template instead of cp
+
+Merged patches (19.4):
+- 4ab5a61 Fix for network configuration not persisting after reboot
+- 84cf125 Removing cloud-user from wheel
+- 31290ab Adding gating tests for Azure, ESXi and AWS
+
+Merged patches (18.5):
+- 2d6b469 add power-state-change module to cloud_final_modules
+- 764159f Adding systemd mount options to wait for cloud-init
+- da4d99e Adding disk_setup to rhel/cloud.cfg
+- f5c6832 Enable cloud-init by default on vmware
+
+Conflicts:
+cloudinit/config/cc_chef.py:
+ - Updated header documentation text
+ - Replacing double quotes by simple quotes
+
+setup.py:
+ - Adding missing cmdclass info
+
+Signed-off-by: Eduardo Otubo <otubo@redhat.com>
+---
+ .gitignore                            |   1 +
+ cloudinit/config/cc_chef.py           |  65 ++-
+ cloudinit/settings.py                 |   7 +-
+ redhat/.gitignore                     |   1 +
+ redhat/Makefile                       |  71 +++
+ redhat/Makefile.common                |  37 ++
+ redhat/cloud-init-tmpfiles.conf       |   1 +
+ redhat/cloud-init.spec.template       | 696 ++++++++++++++++++++++++++
+ redhat/gating.yaml                    |   8 +
+ redhat/rpmbuild/BUILD/.gitignore      |   3 +
+ redhat/rpmbuild/RPMS/.gitignore       |   3 +
+ redhat/rpmbuild/SOURCES/.gitignore    |   3 +
+ redhat/rpmbuild/SPECS/.gitignore      |   3 +
+ redhat/rpmbuild/SRPMS/.gitignore      |   3 +
+ redhat/scripts/frh.py                 |  25 +
+ redhat/scripts/git-backport-diff      | 327 ++++++++++++
+ redhat/scripts/git-compile-check      | 215 ++++++++
+ redhat/scripts/process-patches.sh     |  92 ++++
+ redhat/scripts/tarball_checksum.sh    |   3 +
+ rhel/README.rhel                      |   5 +
+ rhel/cloud-init-tmpfiles.conf         |   1 +
+ rhel/cloud.cfg                        |  69 +++
+ rhel/systemd/cloud-config.service     |  18 +
+ rhel/systemd/cloud-config.target      |  11 +
+ rhel/systemd/cloud-final.service      |  24 +
+ rhel/systemd/cloud-init-local.service |  31 ++
+ rhel/systemd/cloud-init.service       |  25 +
+ rhel/systemd/cloud-init.target        |   7 +
+ setup.py                              |  28 +-
+ tools/read-version                    |  28 +-
+ 30 files changed, 1756 insertions(+), 55 deletions(-)
+ create mode 100644 redhat/.gitignore
+ create mode 100644 redhat/Makefile
+ create mode 100644 redhat/Makefile.common
+ create mode 100644 redhat/cloud-init-tmpfiles.conf
+ create mode 100644 redhat/cloud-init.spec.template
+ create mode 100644 redhat/gating.yaml
+ create mode 100644 redhat/rpmbuild/BUILD/.gitignore
+ create mode 100644 redhat/rpmbuild/RPMS/.gitignore
+ create mode 100644 redhat/rpmbuild/SOURCES/.gitignore
+ create mode 100644 redhat/rpmbuild/SPECS/.gitignore
+ create mode 100644 redhat/rpmbuild/SRPMS/.gitignore
+ create mode 100755 redhat/scripts/frh.py
+ create mode 100755 redhat/scripts/git-backport-diff
+ create mode 100755 redhat/scripts/git-compile-check
+ create mode 100755 redhat/scripts/process-patches.sh
+ create mode 100755 redhat/scripts/tarball_checksum.sh
+ create mode 100644 rhel/README.rhel
+ create mode 100644 rhel/cloud-init-tmpfiles.conf
+ create mode 100644 rhel/cloud.cfg
+ create mode 100644 rhel/systemd/cloud-config.service
+ create mode 100644 rhel/systemd/cloud-config.target
+ create mode 100644 rhel/systemd/cloud-final.service
+ create mode 100644 rhel/systemd/cloud-init-local.service
+ create mode 100644 rhel/systemd/cloud-init.service
+ create mode 100644 rhel/systemd/cloud-init.target
+
+diff --git a/cloudinit/config/cc_chef.py b/cloudinit/config/cc_chef.py
+index fdb3a6e3..d028c548 100644
+--- a/cloudinit/config/cc_chef.py
++++ b/cloudinit/config/cc_chef.py
+@@ -6,7 +6,70 @@
+ #
+ # This file is part of cloud-init. See LICENSE file for license information.
+ 
+-"""Chef: module that configures, starts and installs chef."""
++"""
++Chef
++----
++**Summary:** module that configures, starts and installs chef.
++
++This module enables chef to be installed (from packages or
++from gems, or from omnibus). Before this occurs chef configurations are
++written to disk (validation.pem, client.pem, firstboot.json, client.rb),
++and needed chef folders/directories are created (/etc/chef and /var/log/chef
++and so-on). Then once installing proceeds correctly if configured chef will
++be started (in daemon mode or in non-daemon mode) and then once that has
++finished (if ran in non-daemon mode this will be when chef finishes
++converging, if ran in daemon mode then no further actions are possible since
++chef will have forked into its own process) then a post run function can
++run that can do finishing activities (such as removing the validation pem
++file).
++
++**Internal name:** ``cc_chef``
++
++**Module frequency:** per always
++
++**Supported distros:** all
++
++**Config keys**::
++
++    chef:
++       directories: (defaulting to /etc/chef, /var/log/chef, /var/lib/chef,
++                     /var/cache/chef, /var/backups/chef, /run/chef)
++       validation_cert: (optional string to be written to file validation_key)
++                        special value 'system' means set use existing file
++       validation_key: (optional the path for validation_cert. default
++                        /etc/chef/validation.pem)
++       firstboot_path: (path to write run_list and initial_attributes keys that
++                        should also be present in this configuration, defaults
++                        to /etc/chef/firstboot.json)
++       exec: boolean to run or not run chef (defaults to false, unless
++                                             a gem installed is requested
++                                             where this will then default
++                                             to true)
++
++    chef.rb template keys (if falsey, then will be skipped and not
++                           written to /etc/chef/client.rb)
++
++    chef:
++      client_key:
++      encrypted_data_bag_secret:
++      environment:
++      file_backup_path:
++      file_cache_path:
++      json_attribs:
++      log_level:
++      log_location:
++      node_name:
++      omnibus_url:
++      omnibus_url_retries:
++      omnibus_version:
++      pid_file:
++      server_url:
++      show_time:
++      ssl_verify_mode:
++      validation_cert:
++      validation_key:
++      validation_name:
++"""
+ 
+ import itertools
+ import json
+diff --git a/cloudinit/settings.py b/cloudinit/settings.py
+index ecc1403b..39650a5b 100644
+--- a/cloudinit/settings.py
++++ b/cloudinit/settings.py
+@@ -50,13 +50,16 @@ CFG_BUILTIN = {
+     ],
+     "def_log_file": "/var/log/cloud-init.log",
+     "log_cfgs": [],
+-    "syslog_fix_perms": ["syslog:adm", "root:adm", "root:wheel", "root:root"],
++    "mount_default_fields": [None, None, "auto", "defaults,nofail", "0", "2"],
++    "ssh_deletekeys": False,
++    "ssh_genkeytypes": [],
++    "syslog_fix_perms": [],
+     "system_info": {
+         "paths": {
+             "cloud_dir": "/var/lib/cloud",
+             "templates_dir": "/etc/cloud/templates/",
+         },
+-        "distro": "ubuntu",
++        "distro": "rhel",
+         "network": {"renderers": None},
+     },
+     "vendor_data": {"enabled": True, "prefix": []},
+diff --git a/rhel/README.rhel b/rhel/README.rhel
+new file mode 100644
+index 00000000..aa29630d
+--- /dev/null
++++ b/rhel/README.rhel
+@@ -0,0 +1,5 @@
++The following cloud-init modules are currently unsupported on this OS:
++ - apt_update_upgrade ('apt_update', 'apt_upgrade', 'apt_mirror', 'apt_preserve_sources_list', 'apt_old_mirror', 'apt_sources', 'debconf_selections', 'packages' options)
++ - byobu ('byobu_by_default' option)
++ - chef
++ - grub_dpkg
+diff --git a/rhel/cloud-init-tmpfiles.conf b/rhel/cloud-init-tmpfiles.conf
+new file mode 100644
+index 00000000..0c6d2a3b
+--- /dev/null
++++ b/rhel/cloud-init-tmpfiles.conf
+@@ -0,0 +1 @@
++d /run/cloud-init 0700 root root - -
+diff --git a/rhel/cloud.cfg b/rhel/cloud.cfg
+new file mode 100644
+index 00000000..82e8bf62
+--- /dev/null
++++ b/rhel/cloud.cfg
+@@ -0,0 +1,69 @@
++users:
++ - default
++
++disable_root: 1
++ssh_pwauth:   0
++
++mount_default_fields: [~, ~, 'auto', 'defaults,nofail,x-systemd.requires=cloud-init.service', '0', '2']
++resize_rootfs_tmp: /dev
++ssh_deletekeys:   0
++ssh_genkeytypes:  ~
++syslog_fix_perms: ~
++disable_vmware_customization: false
++
++cloud_init_modules:
++ - disk_setup
++ - migrator
++ - bootcmd
++ - write-files
++ - growpart
++ - resizefs
++ - set_hostname
++ - update_hostname
++ - update_etc_hosts
++ - rsyslog
++ - users-groups
++ - ssh
++
++cloud_config_modules:
++ - mounts
++ - locale
++ - set-passwords
++ - rh_subscription
++ - yum-add-repo
++ - package-update-upgrade-install
++ - timezone
++ - puppet
++ - chef
++ - salt-minion
++ - mcollective
++ - disable-ec2-metadata
++ - runcmd
++
++cloud_final_modules:
++ - rightscale_userdata
++ - scripts-per-once
++ - scripts-per-boot
++ - scripts-per-instance
++ - scripts-user
++ - ssh-authkey-fingerprints
++ - keys-to-console
++ - phone-home
++ - final-message
++ - power-state-change
++
++system_info:
++  default_user:
++    name: cloud-user
++    lock_passwd: true
++    gecos: Cloud User
++    groups: [adm, systemd-journal]
++    sudo: ["ALL=(ALL) NOPASSWD:ALL"]
++    shell: /bin/bash
++  distro: rhel
++  paths:
++    cloud_dir: /var/lib/cloud
++    templates_dir: /etc/cloud/templates
++  ssh_svcname: sshd
++
++# vim:syntax=yaml
+diff --git a/rhel/systemd/cloud-config.service b/rhel/systemd/cloud-config.service
+new file mode 100644
+index 00000000..f3dcd4be
+--- /dev/null
++++ b/rhel/systemd/cloud-config.service
+@@ -0,0 +1,18 @@
++[Unit]
++Description=Apply the settings specified in cloud-config
++After=network-online.target cloud-config.target
++Wants=network-online.target cloud-config.target
++ConditionPathExists=!/etc/cloud/cloud-init.disabled
++ConditionKernelCommandLine=!cloud-init=disabled
++
++[Service]
++Type=oneshot
++ExecStart=/usr/bin/cloud-init modules --mode=config
++RemainAfterExit=yes
++TimeoutSec=0
++
++# Output needs to appear in instance console output
++StandardOutput=journal+console
++
++[Install]
++WantedBy=cloud-init.target
+diff --git a/rhel/systemd/cloud-config.target b/rhel/systemd/cloud-config.target
+new file mode 100644
+index 00000000..ae9b7d02
+--- /dev/null
++++ b/rhel/systemd/cloud-config.target
+@@ -0,0 +1,11 @@
++# cloud-init normally emits a "cloud-config" upstart event to inform third
++# parties that cloud-config is available, which does us no good when we're
++# using systemd.  cloud-config.target serves as this synchronization point
++# instead.  Services that would "start on cloud-config" with upstart can
++# instead use "After=cloud-config.target" and "Wants=cloud-config.target"
++# as appropriate.
++
++[Unit]
++Description=Cloud-config availability
++Wants=cloud-init-local.service cloud-init.service
++After=cloud-init-local.service cloud-init.service
+diff --git a/rhel/systemd/cloud-final.service b/rhel/systemd/cloud-final.service
+new file mode 100644
+index 00000000..e281c0cf
+--- /dev/null
++++ b/rhel/systemd/cloud-final.service
+@@ -0,0 +1,24 @@
++[Unit]
++Description=Execute cloud user/final scripts
++After=network-online.target cloud-config.service rc-local.service
++Wants=network-online.target cloud-config.service
++ConditionPathExists=!/etc/cloud/cloud-init.disabled
++ConditionKernelCommandLine=!cloud-init=disabled
++
++[Service]
++Type=oneshot
++ExecStart=/usr/bin/cloud-init modules --mode=final
++RemainAfterExit=yes
++TimeoutSec=0
++KillMode=process
++# Restart NetworkManager if it is present and running.
++ExecStartPost=/bin/sh -c 'u=NetworkManager.service; \
++ out=$(systemctl show --property=SubState $u) || exit; \
++ [ "$out" = "SubState=running" ] || exit 0; \
++ systemctl reload-or-try-restart $u'
++
++# Output needs to appear in instance console output
++StandardOutput=journal+console
++
++[Install]
++WantedBy=cloud-init.target
+diff --git a/rhel/systemd/cloud-init-local.service b/rhel/systemd/cloud-init-local.service
+new file mode 100644
+index 00000000..8f9f6c9f
+--- /dev/null
++++ b/rhel/systemd/cloud-init-local.service
+@@ -0,0 +1,31 @@
++[Unit]
++Description=Initial cloud-init job (pre-networking)
++DefaultDependencies=no
++Wants=network-pre.target
++After=systemd-remount-fs.service
++Requires=dbus.socket
++After=dbus.socket
++Before=NetworkManager.service network.service
++Before=network-pre.target
++Before=shutdown.target
++Before=firewalld.target
++Conflicts=shutdown.target
++RequiresMountsFor=/var/lib/cloud
++ConditionPathExists=!/etc/cloud/cloud-init.disabled
++ConditionKernelCommandLine=!cloud-init=disabled
++
++[Service]
++Type=oneshot
++ExecStartPre=/bin/mkdir -p /run/cloud-init
++ExecStartPre=/sbin/restorecon /run/cloud-init
++ExecStartPre=/usr/bin/touch /run/cloud-init/enabled
++ExecStart=/usr/bin/cloud-init init --local
++ExecStart=/bin/touch /run/cloud-init/network-config-ready
++RemainAfterExit=yes
++TimeoutSec=0
++
++# Output needs to appear in instance console output
++StandardOutput=journal+console
++
++[Install]
++WantedBy=cloud-init.target
+diff --git a/rhel/systemd/cloud-init.service b/rhel/systemd/cloud-init.service
+new file mode 100644
+index 00000000..d0023a05
+--- /dev/null
++++ b/rhel/systemd/cloud-init.service
+@@ -0,0 +1,25 @@
++[Unit]
++Description=Initial cloud-init job (metadata service crawler)
++Wants=cloud-init-local.service
++Wants=sshd-keygen.service
++Wants=sshd.service
++After=cloud-init-local.service
++After=NetworkManager.service network.service
++Before=network-online.target
++Before=sshd-keygen.service
++Before=sshd.service
++Before=systemd-user-sessions.service
++ConditionPathExists=!/etc/cloud/cloud-init.disabled
++ConditionKernelCommandLine=!cloud-init=disabled
++
++[Service]
++Type=oneshot
++ExecStart=/usr/bin/cloud-init init
++RemainAfterExit=yes
++TimeoutSec=0
++
++# Output needs to appear in instance console output
++StandardOutput=journal+console
++
++[Install]
++WantedBy=cloud-init.target
+diff --git a/rhel/systemd/cloud-init.target b/rhel/systemd/cloud-init.target
+new file mode 100644
+index 00000000..083c3b6f
+--- /dev/null
++++ b/rhel/systemd/cloud-init.target
+@@ -0,0 +1,7 @@
++# cloud-init target is enabled by cloud-init-generator
++# To disable it you can either:
++#  a.) boot with kernel cmdline of 'cloud-init=disabled'
++#  b.) touch a file /etc/cloud/cloud-init.disabled
++[Unit]
++Description=Cloud-init target
++After=multi-user.target
+diff --git a/setup.py b/setup.py
+index a9132d2c..3c377eaa 100755
+--- a/setup.py
++++ b/setup.py
+@@ -139,21 +139,6 @@ INITSYS_FILES = {
+     "sysvinit_deb": [f for f in glob("sysvinit/debian/*") if is_f(f)],
+     "sysvinit_openrc": [f for f in glob("sysvinit/gentoo/*") if is_f(f)],
+     "sysvinit_suse": [f for f in glob("sysvinit/suse/*") if is_f(f)],
+-    "systemd": [
+-        render_tmpl(f)
+-        for f in (
+-            glob("systemd/*.tmpl")
+-            + glob("systemd/*.service")
+-            + glob("systemd/*.socket")
+-            + glob("systemd/*.target")
+-        )
+-        if (is_f(f) and not is_generator(f))
+-    ],
+-    "systemd.generators": [
+-        render_tmpl(f, mode=0o755)
+-        for f in glob("systemd/*")
+-        if is_f(f) and is_generator(f)
+-    ],
+     "upstart": [f for f in glob("upstart/*") if is_f(f)],
+ }
+ INITSYS_ROOTS = {
+@@ -163,10 +148,6 @@ INITSYS_ROOTS = {
+     "sysvinit_deb": "etc/init.d",
+     "sysvinit_openrc": "etc/init.d",
+     "sysvinit_suse": "etc/init.d",
+-    "systemd": pkg_config_read("systemd", "systemdsystemunitdir"),
+-    "systemd.generators": pkg_config_read(
+-        "systemd", "systemdsystemgeneratordir"
+-    ),
+     "upstart": "etc/init/",
+ }
+ INITSYS_TYPES = sorted([f.partition(".")[0] for f in INITSYS_ROOTS.keys()])
+@@ -281,15 +262,13 @@ data_files = [
+     (
+         USR_LIB_EXEC + "/cloud-init",
+         [
+-            "tools/ds-identify",
+             "tools/hook-hotplug",
+             "tools/uncloud-init",
+             "tools/write-ssh-key-fingerprints",
+         ],
+     ),
+     (
+-        USR + "/share/bash-completion/completions",
+-        ["bash_completion/cloud-init"],
++        ETC + "/bash_completion.d", ["bash_completion/cloud-init"],
+     ),
+     (USR + "/share/doc/cloud-init", [f for f in glob("doc/*") if is_f(f)]),
+     (
+@@ -308,8 +287,7 @@ if not platform.system().endswith("BSD"):
+                 ETC + "/NetworkManager/dispatcher.d/",
+                 ["tools/hook-network-manager"],
+             ),
+-            (ETC + "/dhcp/dhclient-exit-hooks.d/", ["tools/hook-dhclient"]),
+-            (LIB + "/udev/rules.d", [f for f in glob("udev/*.rules")]),
++            ("/usr/lib/udev/rules.d", [f for f in glob("udev/*.rules")]),
+             (
+                 ETC + "/systemd/system/sshd-keygen@.service.d/",
+                 ["systemd/disable-sshd-keygen-if-cloud-init-active.conf"],
+@@ -339,8 +317,6 @@ setuptools.setup(
+     scripts=["tools/cloud-init-per"],
+     license="Dual-licensed under GPLv3 or Apache 2.0",
+     data_files=data_files,
+-    install_requires=requirements,
+-    cmdclass=cmdclass,
+     entry_points={
+         "console_scripts": [
+             "cloud-init = cloudinit.cmd.main:main",
+diff --git a/tools/read-version b/tools/read-version
+index 02c90643..79755f78 100755
+--- a/tools/read-version
++++ b/tools/read-version
+@@ -71,32 +71,8 @@ version_long = None
+ is_release_branch_ci = (
+     os.environ.get("TRAVIS_PULL_REQUEST_BRANCH", "").startswith("upstream/")
+ )
+-if is_gitdir(_tdir) and which("git") and not is_release_branch_ci:
+-    flags = []
+-    if use_tags:
+-        flags = ['--tags']
+-    cmd = ['git', 'describe', '--abbrev=8', '--match=[0-9]*'] + flags
+-
+-    try:
+-        version = tiny_p(cmd).strip()
+-    except RuntimeError:
+-        version = None
+-
+-    if version is None or not version.startswith(src_version):
+-        sys.stderr.write("git describe version (%s) differs from "
+-                         "cloudinit.version (%s)\n" % (version, src_version))
+-        sys.stderr.write(
+-            "Please get the latest upstream tags.\n"
+-            "As an example, this can be done with the following:\n"
+-            "$ git remote add upstream https://git.launchpad.net/cloud-init\n"
+-            "$ git fetch upstream --tags\n"
+-        )
+-        sys.exit(1)
+-
+-    version_long = tiny_p(cmd + ["--long"]).strip()
+-else:
+-    version = src_version
+-    version_long = None
++version = src_version
++version_long = None
+ 
+ # version is X.Y.Z[+xxx.gHASH]
+ # version_long is None or X.Y.Z-xxx-gHASH
+-- 
+2.31.1
+

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

@@ -1,30 +1,26 @@
-From b3b96bff187e9d0bfcbfefd5fca05c61bd50d368 Mon Sep 17 00:00:00 2001
+From e0dc628ac553072891fa6607dc91b652efd99be2 Mon Sep 17 00:00:00 2001
 From: Eduardo Otubo <otubo@redhat.com>
 Date: Fri, 7 May 2021 13:36:06 +0200
-Subject: [PATCH] Do not write NM_CONTROLLED=no in generated interface config
- files
+Subject: Do not write NM_CONTROLLED=no in generated interface config  files
 
 Conflicts 20.3:
  - Not appplying patch on cloudinit/net/sysconfig.py since it now has a
 mechanism to identify if cloud-init is running on RHEL, having the
 correct settings for NM_CONTROLLED.
 
-Merged patches (21.1):
-- ecbace48 sysconfig: Don't write BOOTPROTO=dhcp for ipv6 dhcp
-- a1a00383 include 'NOZEROCONF=yes' in /etc/sysconfig/network
 X-downstream-only: true
 Signed-off-by: Eduardo Otubo <otubo@redhat.com>
 Signed-off-by: Ryan McCabe <rmccabe@redhat.com>
 ---
- cloudinit/net/sysconfig.py  | 12 ++++++++++--
+ cloudinit/net/sysconfig.py  |  1 -
  tests/unittests/test_net.py | 28 ----------------------------
- 2 files changed, 10 insertions(+), 30 deletions(-)
+ 2 files changed, 29 deletions(-)
 
 diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
-index d4daa78f..a7dbe55b 100644
+index ba85c4f6..e06ddee7 100644
 --- a/cloudinit/net/sysconfig.py
 +++ b/cloudinit/net/sysconfig.py
-@@ -316,7 +316,6 @@ class Renderer(renderer.Renderer):
+@@ -336,7 +336,6 @@ class Renderer(renderer.Renderer):
          "rhel": {
              "ONBOOT": True,
              "USERCTL": False,
@@ -32,29 +28,11 @@ index d4daa78f..a7dbe55b 100644
              "BOOTPROTO": "none",
          },
          "suse": {"BOOTPROTO": "static", "STARTMODE": "auto"},
-@@ -1019,7 +1018,16 @@ class Renderer(renderer.Renderer):
-         # Distros configuring /etc/sysconfig/network as a file e.g. Centos
-         if sysconfig_path.endswith("network"):
-             util.ensure_dir(os.path.dirname(sysconfig_path))
--            netcfg = [_make_header(), "NETWORKING=yes"]
-+            netcfg = []
-+            for line in util.load_file(sysconfig_path, quiet=True).split('\n'):
-+                if 'cloud-init' in line:
-+                    break
-+                if not line.startswith(('NETWORKING=',
-+                                        'IPV6_AUTOCONF=',
-+                                        'NETWORKING_IPV6=')):
-+                    netcfg.append(line)
-+            # Now generate the cloud-init portion of sysconfig/network
-+            netcfg.extend([_make_header(), 'NETWORKING=yes'])
-             if network_state.use_ipv6:
-                 netcfg.append("NETWORKING_IPV6=yes")
-                 netcfg.append("IPV6_AUTOCONF=no")
 diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
-index 056aaeb6..0f523ff8 100644
+index 47e4ba00..591241b3 100644
 --- a/tests/unittests/test_net.py
 +++ b/tests/unittests/test_net.py
-@@ -585,7 +585,6 @@ GATEWAY=172.19.3.254
+@@ -579,7 +579,6 @@ GATEWAY=172.19.3.254
  HWADDR=fa:16:3e:ed:9a:59
  IPADDR=172.19.1.34
  NETMASK=255.255.252.0
@@ -62,7 +40,7 @@ index 056aaeb6..0f523ff8 100644
  ONBOOT=yes
  TYPE=Ethernet
  USERCTL=no
-@@ -749,7 +748,6 @@ IPADDR=172.19.1.34
+@@ -712,7 +711,6 @@ IPADDR=172.19.1.34
  IPADDR1=10.0.0.10
  NETMASK=255.255.252.0
  NETMASK1=255.255.255.0
@@ -70,7 +48,7 @@ index 056aaeb6..0f523ff8 100644
  ONBOOT=yes
  TYPE=Ethernet
  USERCTL=no
-@@ -911,7 +909,6 @@ IPV6_AUTOCONF=no
+@@ -874,7 +872,6 @@ IPV6_AUTOCONF=no
  IPV6_DEFAULTGW=2001:DB8::1
  IPV6_FORCE_ACCEPT_RA=no
  NETMASK=255.255.252.0
@@ -78,7 +56,7 @@ index 056aaeb6..0f523ff8 100644
  ONBOOT=yes
  TYPE=Ethernet
  USERCTL=no
-@@ -1090,7 +1087,6 @@ NETWORK_CONFIGS = {
+@@ -1053,7 +1050,6 @@ NETWORK_CONFIGS = {
                  BOOTPROTO=none
                  DEVICE=eth1
                  HWADDR=cf:d6:af:48:e8:80
@@ -86,7 +64,7 @@ index 056aaeb6..0f523ff8 100644
                  ONBOOT=yes
                  TYPE=Ethernet
                  USERCTL=no"""
-@@ -1109,7 +1105,6 @@ NETWORK_CONFIGS = {
+@@ -1072,7 +1068,6 @@ NETWORK_CONFIGS = {
                  IPADDR=192.168.21.3
                  NETMASK=255.255.255.0
                  METRIC=10000
@@ -94,7 +72,7 @@ index 056aaeb6..0f523ff8 100644
                  ONBOOT=yes
                  TYPE=Ethernet
                  USERCTL=no"""
-@@ -1353,7 +1348,6 @@ NETWORK_CONFIGS = {
+@@ -1244,7 +1239,6 @@ NETWORK_CONFIGS = {
                  IPV6_AUTOCONF=no
                  IPV6_FORCE_ACCEPT_RA=no
                  NETMASK=255.255.255.0
@@ -102,7 +80,7 @@ index 056aaeb6..0f523ff8 100644
                  ONBOOT=yes
                  TYPE=Ethernet
                  USERCTL=no
-@@ -2377,7 +2371,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+@@ -2093,7 +2087,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
                  DHCPV6C=yes
                  IPV6INIT=yes
                  MACADDR=aa:bb:cc:dd:ee:ff
@@ -110,7 +88,7 @@ index 056aaeb6..0f523ff8 100644
                  ONBOOT=yes
                  TYPE=Bond
                  USERCTL=no"""
-@@ -2387,7 +2380,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+@@ -2103,7 +2096,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
                  BOOTPROTO=dhcp
                  DEVICE=bond0.200
                  DHCLIENT_SET_DEFAULT_ROUTE=no
@@ -118,7 +96,7 @@ index 056aaeb6..0f523ff8 100644
                  ONBOOT=yes
                  PHYSDEV=bond0
                  USERCTL=no
-@@ -2407,7 +2399,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+@@ -2123,7 +2115,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
                  IPV6_DEFAULTGW=2001:4800:78ff:1b::1
                  MACADDR=bb:bb:bb:bb:bb:aa
                  NETMASK=255.255.255.0
@@ -126,7 +104,7 @@ index 056aaeb6..0f523ff8 100644
                  ONBOOT=yes
                  PRIO=22
                  STP=no
-@@ -2419,7 +2410,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+@@ -2135,7 +2126,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
                  BOOTPROTO=none
                  DEVICE=eth0
                  HWADDR=c0:d6:9f:2c:e8:80
@@ -134,7 +112,7 @@ index 056aaeb6..0f523ff8 100644
                  ONBOOT=yes
                  TYPE=Ethernet
                  USERCTL=no"""
-@@ -2438,7 +2428,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+@@ -2154,7 +2144,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
                  MTU=1500
                  NETMASK=255.255.255.0
                  NETMASK1=255.255.255.0
@@ -142,7 +120,7 @@ index 056aaeb6..0f523ff8 100644
                  ONBOOT=yes
                  PHYSDEV=eth0
                  USERCTL=no
-@@ -2450,7 +2439,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+@@ -2166,7 +2155,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
                  DEVICE=eth1
                  HWADDR=aa:d6:9f:2c:e8:80
                  MASTER=bond0
@@ -150,7 +128,7 @@ index 056aaeb6..0f523ff8 100644
                  ONBOOT=yes
                  SLAVE=yes
                  TYPE=Ethernet
-@@ -2462,7 +2450,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+@@ -2178,7 +2166,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
                  DEVICE=eth2
                  HWADDR=c0:bb:9f:2c:e8:80
                  MASTER=bond0
@@ -158,7 +136,7 @@ index 056aaeb6..0f523ff8 100644
                  ONBOOT=yes
                  SLAVE=yes
                  TYPE=Ethernet
-@@ -2474,7 +2461,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+@@ -2190,7 +2177,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
                  BRIDGE=br0
                  DEVICE=eth3
                  HWADDR=66:bb:9f:2c:e8:80
@@ -166,7 +144,7 @@ index 056aaeb6..0f523ff8 100644
                  ONBOOT=yes
                  TYPE=Ethernet
                  USERCTL=no"""
-@@ -2485,7 +2471,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+@@ -2201,7 +2187,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
                  BRIDGE=br0
                  DEVICE=eth4
                  HWADDR=98:bb:9f:2c:e8:80
@@ -174,7 +152,7 @@ index 056aaeb6..0f523ff8 100644
                  ONBOOT=yes
                  TYPE=Ethernet
                  USERCTL=no"""
-@@ -2496,7 +2481,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+@@ -2212,7 +2197,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
                  DEVICE=eth5
                  DHCLIENT_SET_DEFAULT_ROUTE=no
                  HWADDR=98:bb:9f:2c:e8:8a
@@ -182,7 +160,7 @@ index 056aaeb6..0f523ff8 100644
                  ONBOOT=no
                  TYPE=Ethernet
                  USERCTL=no"""
-@@ -3220,7 +3204,6 @@ iface bond0 inet6 static
+@@ -2689,7 +2673,6 @@ iface bond0 inet6 static
          MTU=9000
          NETMASK=255.255.255.0
          NETMASK1=255.255.255.0
@@ -190,7 +168,7 @@ index 056aaeb6..0f523ff8 100644
          ONBOOT=yes
          TYPE=Bond
          USERCTL=no
-@@ -3232,7 +3215,6 @@ iface bond0 inet6 static
+@@ -2701,7 +2684,6 @@ iface bond0 inet6 static
          DEVICE=bond0s0
          HWADDR=aa:bb:cc:dd:e8:00
          MASTER=bond0
@@ -198,7 +176,7 @@ index 056aaeb6..0f523ff8 100644
          ONBOOT=yes
          SLAVE=yes
          TYPE=Ethernet
-@@ -3260,7 +3242,6 @@ iface bond0 inet6 static
+@@ -2729,7 +2711,6 @@ iface bond0 inet6 static
          DEVICE=bond0s1
          HWADDR=aa:bb:cc:dd:e8:01
          MASTER=bond0
@@ -206,7 +184,7 @@ index 056aaeb6..0f523ff8 100644
          ONBOOT=yes
          SLAVE=yes
          TYPE=Ethernet
-@@ -3406,7 +3387,6 @@ iface bond0 inet6 static
+@@ -2794,7 +2775,6 @@ iface bond0 inet6 static
                  BOOTPROTO=none
                  DEVICE=en0
                  HWADDR=aa:bb:cc:dd:e8:00
@@ -214,7 +192,7 @@ index 056aaeb6..0f523ff8 100644
                  ONBOOT=yes
                  TYPE=Ethernet
                  USERCTL=no"""
-@@ -3427,7 +3407,6 @@ iface bond0 inet6 static
+@@ -2815,7 +2795,6 @@ iface bond0 inet6 static
                  MTU=2222
                  NETMASK=255.255.255.0
                  NETMASK1=255.255.255.0
@@ -222,7 +200,7 @@ index 056aaeb6..0f523ff8 100644
                  ONBOOT=yes
                  PHYSDEV=en0
                  USERCTL=no
-@@ -3553,7 +3532,6 @@ iface bond0 inet6 static
+@@ -2890,7 +2869,6 @@ iface bond0 inet6 static
                  DEVICE=br0
                  IPADDR=192.168.2.2
                  NETMASK=255.255.255.0
@@ -230,7 +208,7 @@ index 056aaeb6..0f523ff8 100644
                  ONBOOT=yes
                  PRIO=22
                  STP=no
-@@ -3769,7 +3747,6 @@ iface bond0 inet6 static
+@@ -3032,7 +3010,6 @@ iface bond0 inet6 static
                  HWADDR=52:54:00:12:34:00
                  IPADDR=192.168.1.2
                  NETMASK=255.255.255.0
@@ -238,7 +216,7 @@ index 056aaeb6..0f523ff8 100644
                  ONBOOT=no
                  TYPE=Ethernet
                  USERCTL=no
-@@ -3781,7 +3758,6 @@ iface bond0 inet6 static
+@@ -3044,7 +3021,6 @@ iface bond0 inet6 static
                  DEVICE=eth1
                  HWADDR=52:54:00:12:34:aa
                  MTU=1480
@@ -246,7 +224,7 @@ index 056aaeb6..0f523ff8 100644
                  ONBOOT=yes
                  TYPE=Ethernet
                  USERCTL=no
-@@ -3792,7 +3768,6 @@ iface bond0 inet6 static
+@@ -3055,7 +3031,6 @@ iface bond0 inet6 static
                  BOOTPROTO=none
                  DEVICE=eth2
                  HWADDR=52:54:00:12:34:ff
@@ -254,7 +232,7 @@ index 056aaeb6..0f523ff8 100644
                  ONBOOT=no
                  TYPE=Ethernet
                  USERCTL=no
-@@ -4469,7 +4444,6 @@ class TestRhelSysConfigRendering(CiTestCase):
+@@ -3628,7 +3603,6 @@ class TestRhelSysConfigRendering(CiTestCase):
  BOOTPROTO=dhcp
  DEVICE=eth1000
  HWADDR=07-1c-c6-75-a4-be
@@ -262,7 +240,7 @@ index 056aaeb6..0f523ff8 100644
  ONBOOT=yes
  TYPE=Ethernet
  USERCTL=no
-@@ -4681,7 +4655,6 @@ GATEWAY=10.0.2.2
+@@ -3840,7 +3814,6 @@ GATEWAY=10.0.2.2
  HWADDR=52:54:00:12:34:00
  IPADDR=10.0.2.15
  NETMASK=255.255.255.0
@@ -270,7 +248,7 @@ index 056aaeb6..0f523ff8 100644
  ONBOOT=yes
  TYPE=Ethernet
  USERCTL=no
-@@ -4751,7 +4724,6 @@ USERCTL=no
+@@ -3910,7 +3883,6 @@ USERCTL=no
  #
  BOOTPROTO=dhcp
  DEVICE=eth0
@@ -278,3 +256,6 @@ index 056aaeb6..0f523ff8 100644
  ONBOOT=yes
  TYPE=Ethernet
  USERCTL=no
+-- 
+2.31.1
+

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

@@ -1,42 +0,0 @@
-From c589da20eb92231ef08e10c9724e3e6c663e6ce2 Mon Sep 17 00:00:00 2001
-From: Eduardo Otubo <otubo@redhat.com>
-Date: Thu, 17 Feb 2022 15:32:35 +0100
-Subject: [PATCH] Setting highest autoconnect priority for network-scripts
-
-RH-Author: Eduardo Otubo <otubo@redhat.com>
-RH-MergeRequest: 22: Setting highest autoconnect priority for network-scripts
-RH-Commit: [1/1] 34f1d62f8934a983a124df95b861a1e448681d3b (otubo/cloud-init-src)
-RH-Bugzilla: 2036060
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-
-Set the highest autoconnect priority for network-scripts which is
-loaded by NetworkManager ifcfg-rh plugin.  Note that keyfile is the only
-and default existing plugin on RHEL9, by setting the highest autoconnect
-priority for network-scripts, NetworkManager will activate
-network-scripts but keyfile.  Network-scripts path:
-
-Since this is a blocking issue, we decided to have this one-liner
-downstream-only patch so we can move forward and have a better
-NetworkManager support later on the release.
-
-rhbz: 2036060
-x-downstream-only: yes
-
-Signed-off-by: Eduardo Otubo <otubo@redhat.com>
----
- cloudinit/net/sysconfig.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
-index a7dbe55b..4262cd48 100644
---- a/cloudinit/net/sysconfig.py
-+++ b/cloudinit/net/sysconfig.py
-@@ -317,6 +317,7 @@ class Renderer(renderer.Renderer):
-             "ONBOOT": True,
-             "USERCTL": False,
-             "BOOTPROTO": "none",
-+            "AUTOCONNECT_PRIORITY": 999
-         },
-         "suse": {"BOOTPROTO": "static", "STARTMODE": "auto"},
-     }

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

@@ -1,7 +1,7 @@
-From dfff374f66904e84fb07ca157ba010fac6b5f1de Mon Sep 17 00:00:00 2001
+From cb7b35ca10c82c9725c3527e3ec5fb8cb7c61bc0 Mon Sep 17 00:00:00 2001
 From: Eduardo Otubo <otubo@redhat.com>
 Date: Fri, 7 May 2021 13:36:08 +0200
-Subject: [PATCH] limit permissions on def_log_file
+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.
@@ -13,10 +13,7 @@ X-approved-upstream: true
 Conflicts 21.1:
     cloudinit/stages.py: adjusting call of ensure_file() to use more
 recent version
-Confilicts 23.1.1:
-    use "" instead of ''
 
-Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
 Signed-off-by: Eduardo Otubo <otubo@redhat.com>
 ---
  cloudinit/settings.py         | 1 +
@@ -25,22 +22,22 @@ Signed-off-by: Eduardo Otubo <otubo@redhat.com>
  3 files changed, 6 insertions(+)
 
 diff --git a/cloudinit/settings.py b/cloudinit/settings.py
-index edbb217d..3d541141 100644
+index 39650a5b..3c2145e9 100644
 --- a/cloudinit/settings.py
 +++ b/cloudinit/settings.py
-@@ -52,6 +52,7 @@ CFG_BUILTIN = {
+@@ -49,6 +49,7 @@ CFG_BUILTIN = {
          "None",
      ],
      "def_log_file": "/var/log/cloud-init.log",
 +    "def_log_file_mode": 0o600,
      "log_cfgs": [],
      "mount_default_fields": [None, None, "auto", "defaults,nofail", "0", "2"],
-     "syslog_fix_perms": [],
+     "ssh_deletekeys": False,
 diff --git a/cloudinit/stages.py b/cloudinit/stages.py
-index 9494a0bf..a624a6fb 100644
+index 3f17294b..61db1dbd 100644
 --- a/cloudinit/stages.py
 +++ b/cloudinit/stages.py
-@@ -202,6 +202,7 @@ class Init:
+@@ -205,6 +205,7 @@ class Init(object):
      def _initialize_filesystem(self):
          util.ensure_dirs(self._initial_subdirs())
          log_file = util.get_cfg_option_str(self.cfg, "def_log_file")
@@ -49,10 +46,10 @@ index 9494a0bf..a624a6fb 100644
              util.ensure_file(log_file, mode=0o640, preserve_mode=True)
              perms = self.cfg.get("syslog_fix_perms")
 diff --git a/doc/examples/cloud-config.txt b/doc/examples/cloud-config.txt
-index 15d788f3..b6d16c9c 100644
+index a2b4a3fa..0ccf3147 100644
 --- a/doc/examples/cloud-config.txt
 +++ b/doc/examples/cloud-config.txt
-@@ -383,10 +383,14 @@ timezone: US/Eastern
+@@ -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.
  #
@@ -67,3 +64,6 @@ index 15d788f3..b6d16c9c 100644
  syslog_fix_perms: syslog:root
  
  # you can set passwords for a user or multiple users
+-- 
+2.31.1
+

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

@@ -0,0 +1,52 @@
+From ffa647e83efd4293bd027e9e390274aad8a12d94 Mon Sep 17 00:00:00 2001
+From: Eduardo Otubo <otubo@redhat.com>
+Date: Fri, 7 May 2021 13:36:13 +0200
+Subject: include 'NOZEROCONF=yes' in /etc/sysconfig/network
+
+RH-Author: Eduardo Otubo <otubo@redhat.com>
+Message-id: <20190320114559.23708-1-otubo@redhat.com>
+Patchwork-id: 84937
+O-Subject: [RHEL-7.7 cloud-init PATCH] include 'NOZEROCONF=yes' in /etc/sysconfig/network
+Bugzilla: 1653131
+RH-Acked-by: Cathy Avery <cavery@redhat.com>
+RH-Acked-by: Mohammed Gamal <mgamal@redhat.com>
+RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
+
+The option NOZEROCONF=yes is not included by default in
+/etc/sysconfig/network, which is required by Overcloud instances. The
+patch also includes tests for the modifications.
+
+X-downstream-only: yes
+Resolves: rhbz#1653131
+
+Signed-off-by: Eduardo Otubo <otubo@redhat.com>
+Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
+---
+ cloudinit/net/sysconfig.py | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
+index e06ddee7..362e8d19 100644
+--- a/cloudinit/net/sysconfig.py
++++ b/cloudinit/net/sysconfig.py
+@@ -1038,7 +1038,16 @@ class Renderer(renderer.Renderer):
+         # Distros configuring /etc/sysconfig/network as a file e.g. Centos
+         if sysconfig_path.endswith("network"):
+             util.ensure_dir(os.path.dirname(sysconfig_path))
+-            netcfg = [_make_header(), "NETWORKING=yes"]
++            netcfg = []
++            for line in util.load_file(sysconfig_path, quiet=True).split("\n"):
++                if "cloud-init" in line:
++                    break
++                if not line.startswith(("NETWORKING=",
++                                        "IPV6_AUTOCONF=",
++                                        "NETWORKING_IPV6=")):
++                    netcfg.append(line)
++            # Now generate the cloud-init portion of sysconfig/network
++            netcfg.extend([_make_header(), "NETWORKING=yes"])
+             if network_state.use_ipv6:
+                 netcfg.append("NETWORKING_IPV6=yes")
+                 netcfg.append("IPV6_AUTOCONF=no")
+-- 
+2.31.1
+

SOURCES/0005-Manual-revert-Use-Network-Manager-and-Netplan-as-def.patch

@@ -1,92 +0,0 @@
-From ecae81f98ce230266eb99671b74534a4ede660f0 Mon Sep 17 00:00:00 2001
-From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-Date: Fri, 10 Mar 2023 11:51:48 +0100
-Subject: [PATCH] Manual revert "Use Network-Manager and Netplan as default
- renderers for RHEL and Fedora (#1465)"
-
-This reverts changes done in commit 7703aa98b.
-Done by hand because the doc file affected by that commit has changed.
-
-X-downstream-only: true
-
-Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
----
- cloudinit/net/renderers.py           |  1 -
- config/cloud.cfg.tmpl                |  3 ---
- doc/rtd/reference/network-config.rst | 16 ++--------------
- 3 files changed, 2 insertions(+), 18 deletions(-)
-
-diff --git a/cloudinit/net/renderers.py b/cloudinit/net/renderers.py
-index fcf7feba..b241683f 100644
---- a/cloudinit/net/renderers.py
-+++ b/cloudinit/net/renderers.py
-@@ -30,7 +30,6 @@ DEFAULT_PRIORITY = [
-     "eni",
-     "sysconfig",
-     "netplan",
--    "network-manager",
-     "freebsd",
-     "netbsd",
-     "openbsd",
-diff --git a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl
-index 7238c102..12f32c51 100644
---- a/config/cloud.cfg.tmpl
-+++ b/config/cloud.cfg.tmpl
-@@ -381,9 +381,6 @@ system_info:
- {% elif variant in ["dragonfly"] %}
-    network:
-       renderers: ['freebsd']
--{% elif variant in ["fedora"] or is_rhel %}
--   network:
--      renderers: ['netplan', 'network-manager', 'networkd', 'sysconfig', 'eni']
- {% elif variant == "openmandriva" %}
-    network:
-       renderers: ['network-manager', 'networkd']
-diff --git a/doc/rtd/reference/network-config.rst b/doc/rtd/reference/network-config.rst
-index ea331f1c..bc52afa5 100644
---- a/doc/rtd/reference/network-config.rst
-+++ b/doc/rtd/reference/network-config.rst
-@@ -176,16 +176,6 @@ this state, ``cloud-init`` delegates rendering of the configuration to
- distro-supported formats. The following ``renderers`` are supported in
- ``cloud-init``:
- 
--NetworkManager
----------------
--
--`NetworkManager`_ is the standard Linux network configuration tool suite. It
--supports a wide range of networking setups. Configuration is typically stored
--in :file:`/etc/NetworkManager`.
--
--It is the default for a number of Linux distributions; notably Fedora,
--CentOS/RHEL, and their derivatives.
--
- ENI
- ---
- 
-@@ -223,7 +213,6 @@ preference) is as follows:
- - ENI
- - Sysconfig
- - Netplan
--- NetworkManager
- - FreeBSD
- - NetBSD
- - OpenBSD
-@@ -234,7 +223,6 @@ preference) is as follows:
- 
- - **ENI**: using ``ifup``, ``ifdown`` to manage device setup/teardown
- - **Netplan**: using ``netplan apply`` to manage device setup/teardown
--- **NetworkManager**: using ``nmcli`` to manage device setup/teardown
- - **Networkd**: using ``ip`` to manage device setup/teardown
- 
- When applying the policy, ``cloud-init`` checks if the current instance has the
-@@ -244,8 +232,8 @@ supplying an updated configuration in cloud-config. ::
- 
-   system_info:
-     network:
--      renderers: ['netplan', 'network-manager', 'eni', 'sysconfig', 'freebsd', 'netbsd', 'openbsd']
--      activators: ['eni', 'netplan', 'network-manager', 'networkd']
-+      renderers: ['netplan', 'eni', 'sysconfig', 'freebsd', 'netbsd', 'openbsd']
-+      activators: ['eni', 'netplan', 'networkd']
- 
- Network configuration tools
- ===========================

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

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

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

@@ -0,0 +1,65 @@
+From b545a0cbabe8924d048b7172b30e7aad59ed32d5 Mon Sep 17 00:00:00 2001
+From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+Date: Thu, 20 May 2021 08:53:55 +0200
+Subject: rhel/cloud.cfg: remove ssh_genkeytypes in settings.py and set in
+ cloud.cfg
+
+RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-MergeRequest: 10: rhel/cloud.cfg: remove ssh_genkeytypes in settings.py and set in cloud.cfg
+RH-Commit: [1/1] 6da989423b9b6e017afbac2f1af3649b0487310f
+RH-Bugzilla: 1957532
+RH-Acked-by: Eduardo Otubo <otubo@redhat.com>
+RH-Acked-by: Cathy Avery <cavery@redhat.com>
+RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
+RH-Acked-by: Mohamed Gamal Morsy <mmorsy@redhat.com>
+
+Currently genkeytypes in cloud.cfg is set to None, so together with
+ssh_deletekeys=1 cloudinit on first boot it will just delete the existing
+keys and not generate new ones.
+
+Just removing that property in cloud.cfg is not enough, because
+settings.py provides another empty default value that will be used
+instead, resulting to no key generated even when the property is not defined.
+
+Removing genkeytypes also in settings.py will default to GENERATE_KEY_NAMES,
+but since we want only 'rsa', 'ecdsa' and 'ed25519', add back genkeytypes in
+cloud.cfg with the above defaults.
+
+Also remove ssh_deletekeys in settings.py as we always need
+to 1 (and it also defaults to 1).
+
+Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+---
+ cloudinit/settings.py | 2 --
+ rhel/cloud.cfg        | 2 +-
+ 2 files changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/cloudinit/settings.py b/cloudinit/settings.py
+index 3c2145e9..71672e10 100644
+--- a/cloudinit/settings.py
++++ b/cloudinit/settings.py
+@@ -52,8 +52,6 @@ CFG_BUILTIN = {
+     "def_log_file_mode": 0o600,
+     "log_cfgs": [],
+     "mount_default_fields": [None, None, "auto", "defaults,nofail", "0", "2"],
+-    "ssh_deletekeys": False,
+-    "ssh_genkeytypes": [],
+     "syslog_fix_perms": [],
+     "system_info": {
+         "paths": {
+diff --git a/rhel/cloud.cfg b/rhel/cloud.cfg
+index 9ecba215..cbee197a 100644
+--- a/rhel/cloud.cfg
++++ b/rhel/cloud.cfg
+@@ -7,7 +7,7 @@ ssh_pwauth:   0
+ mount_default_fields: [~, ~, 'auto', 'defaults,nofail,x-systemd.requires=cloud-init.service', '0', '2']
+ resize_rootfs_tmp: /dev
+ ssh_deletekeys:   1
+-ssh_genkeytypes:  ~
++ssh_genkeytypes:  ['rsa', 'ecdsa', 'ed25519']
+ syslog_fix_perms: ~
+ disable_vmware_customization: false
+ 
+-- 
+2.31.1
+

SOURCES/0007-rhel-make-sure-previous-hostname-file-ends-with-a-ne.patch

@@ -1,54 +0,0 @@
-From ac0cf308318d423162ce3b7be32dcbf88f20ff50 Mon Sep 17 00:00:00 2001
-From: Ani Sinha <anisinha@redhat.com>
-Date: Tue, 4 Apr 2023 19:59:07 +0530
-Subject: [PATCH] rhel: make sure previous-hostname file ends with a new line
- (#2108)
-
-cloud-init strips new line from "/etc/hostname" on rhel distro when processing
-"/var/lib/cloud/data/previous-hostname". Although this does not pose a serious
-issue, it is still better if the behavior is similar to other distros like
-Ubuntu where /previous-hostname does end with a new line. Fix this issue by
-using hostname parser in rhel similar to debian.
-
-Signed-off-by: Ani Sinha <anisinha@redhat.com>
-(cherry picked from commit 6d42aa8e2c1a5454a658ab4e2b9cead2677c77cd)
----
- cloudinit/distros/rhel.py | 5 ++++-
- tools/.github-cla-signers | 1 +
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/cloudinit/distros/rhel.py b/cloudinit/distros/rhel.py
-index df7dc3d6..9625709e 100644
---- a/cloudinit/distros/rhel.py
-+++ b/cloudinit/distros/rhel.py
-@@ -13,6 +13,7 @@ from cloudinit import distros, helpers
- from cloudinit import log as logging
- from cloudinit import subp, util
- from cloudinit.distros import rhel_util
-+from cloudinit.distros.parsers.hostname import HostnameConf
- from cloudinit.settings import PER_INSTANCE
- 
- LOG = logging.getLogger(__name__)
-@@ -111,7 +112,9 @@ class Distro(distros.Distro):
-         # systemd will never update previous-hostname for us, so
-         # we need to do it ourselves
-         if self.uses_systemd() and filename.endswith("/previous-hostname"):
--            util.write_file(filename, hostname)
-+            conf = HostnameConf("")
-+            conf.set_hostname(hostname)
-+            util.write_file(filename, str(conf), 0o644)
-         elif self.uses_systemd():
-             subp.subp(["hostnamectl", "set-hostname", str(hostname)])
-         else:
-diff --git a/tools/.github-cla-signers b/tools/.github-cla-signers
-index d8cca015..457dacf4 100644
---- a/tools/.github-cla-signers
-+++ b/tools/.github-cla-signers
-@@ -9,6 +9,7 @@ andgein
- andrew-lee-metaswitch
- andrewbogott
- andrewlukoshko
-+ani-sinha
- antonyc
- aswinrajamannar
- beantaxi

SOURCES/0008-Don-t-change-permissions-of-netrules-target-2076.patch

@@ -1,121 +0,0 @@
-From 34ef256dc614c7dcf5b04a431d410030e333d82b Mon Sep 17 00:00:00 2001
-From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-Date: Mon, 17 Apr 2023 10:20:16 +0200
-Subject: [PATCH] Don't change permissions of netrules target (#2076)
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2182948
-
-commit 56c88cafd1b3606e814069a79f4ec265fc427c87
-Author: James Falcon <james.falcon@canonical.com>
-Date:   Thu Mar 23 10:21:56 2023 -0500
-
-    Don't change permissions of netrules target (#2076)
-
-    Set permissions if file doesn't exist. Leave them if it does.
-
-    LP: #2011783
-
-    Co-authored-by: Chad Smith <chad.smith@canonical.com>
-
- Conflicts:
-       cloudinit/net/sysconfig.py: enable_ifcfg_rh missing upstream
-
-Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
----
- cloudinit/net/eni.py                      |  4 +++-
- cloudinit/net/sysconfig.py                |  7 ++++++-
- tests/unittests/distros/test_netconfig.py | 20 ++++++++++++++++++--
- 3 files changed, 27 insertions(+), 4 deletions(-)
-
-diff --git a/cloudinit/net/eni.py b/cloudinit/net/eni.py
-index 53bd35ca..1de3bec2 100644
---- a/cloudinit/net/eni.py
-+++ b/cloudinit/net/eni.py
-@@ -576,7 +576,9 @@ class Renderer(renderer.Renderer):
-             netrules = subp.target_path(target, self.netrules_path)
-             util.ensure_dir(os.path.dirname(netrules))
-             util.write_file(
--                netrules, self._render_persistent_net(network_state)
-+                netrules,
-+                content=self._render_persistent_net(network_state),
-+                preserve_mode=True,
-             )
- 
- 
-diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
-index 765c248a..e08c0c69 100644
---- a/cloudinit/net/sysconfig.py
-+++ b/cloudinit/net/sysconfig.py
-@@ -1034,7 +1034,12 @@ class Renderer(renderer.Renderer):
-         if self.netrules_path:
-             netrules_content = self._render_persistent_net(network_state)
-             netrules_path = subp.target_path(target, self.netrules_path)
--            util.write_file(netrules_path, netrules_content, file_mode)
-+            util.write_file(
-+                netrules_path,
-+                content=netrules_content,
-+                mode=file_mode,
-+                preserve_mode=True,
-+            )
-         if available_nm(target=target):
-             enable_ifcfg_rh(subp.target_path(target, path=NM_CFG_FILE))
- 
-diff --git a/tests/unittests/distros/test_netconfig.py b/tests/unittests/distros/test_netconfig.py
-index e9fb0591..b1c89ce3 100644
---- a/tests/unittests/distros/test_netconfig.py
-+++ b/tests/unittests/distros/test_netconfig.py
-@@ -458,8 +458,16 @@ class TestNetCfgDistroUbuntuEni(TestNetCfgDistroBase):
-     def eni_path(self):
-         return "/etc/network/interfaces.d/50-cloud-init.cfg"
- 
-+    def rules_path(self):
-+        return "/etc/udev/rules.d/70-persistent-net.rules"
-+
-     def _apply_and_verify_eni(
--        self, apply_fn, config, expected_cfgs=None, bringup=False
-+        self,
-+        apply_fn,
-+        config,
-+        expected_cfgs=None,
-+        bringup=False,
-+        previous_files=(),
-     ):
-         if not expected_cfgs:
-             raise ValueError("expected_cfg must not be None")
-@@ -467,7 +475,11 @@ class TestNetCfgDistroUbuntuEni(TestNetCfgDistroBase):
-         tmpd = None
-         with mock.patch("cloudinit.net.eni.available") as m_avail:
-             m_avail.return_value = True
-+            path_modes = {}
-             with self.reRooted(tmpd) as tmpd:
-+                for previous_path, content, mode in previous_files:
-+                    util.write_file(previous_path, content, mode=mode)
-+                    path_modes[previous_path] = mode
-                 apply_fn(config, bringup)
- 
-         results = dir2dict(tmpd)
-@@ -478,7 +490,9 @@ class TestNetCfgDistroUbuntuEni(TestNetCfgDistroBase):
-             print(results[cfgpath])
-             print("----------")
-             self.assertEqual(expected, results[cfgpath])
--            self.assertEqual(0o644, get_mode(cfgpath, tmpd))
-+            self.assertEqual(
-+                path_modes.get(cfgpath, 0o644), get_mode(cfgpath, tmpd)
-+            )
-