Merge branch 'c9s' of gitlab.com:redhat/centos-stream/rpms/cloud-init into c9s

0001-Add-initial-redhat-changes.patch

@@ -1,7 +1,7 @@
 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 01/10] Add initial redhat changes
+Subject: [PATCH] Add initial redhat changes
 
 Adding minimal set of changes necessary for successful build of the package
 on RHEL/CentOS 9 Stream koji.
@@ -59,6 +59,3 @@ index 8684d003..edbb217d 100644
          "network": {"renderers": None},
      },
      "vendor_data": {"enabled": True, "prefix": []},
--- 
-2.40.0
-

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

@@ -1,8 +1,8 @@
 From b3b96bff187e9d0bfcbfefd5fca05c61bd50d368 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/10] Do not write NM_CONTROLLED=no in generated interface
+Subject: [PATCH] Do not write NM_CONTROLLED=no in generated interface config
- config files
+ files
 
 Conflicts 20.3:
  - Not appplying patch on cloudinit/net/sysconfig.py since it now has a
@@ -278,6 +278,3 @@ index 056aaeb6..0f523ff8 100644
  ONBOOT=yes
  TYPE=Ethernet
  USERCTL=no
--- 
-2.40.0
-

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

@@ -1,8 +1,7 @@
 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 03/10] Setting highest autoconnect priority for
+Subject: [PATCH] Setting highest autoconnect priority for network-scripts
- network-scripts
 
 RH-Author: Eduardo Otubo <otubo@redhat.com>
 RH-MergeRequest: 22: Setting highest autoconnect priority for network-scripts
@@ -41,6 +40,3 @@ index a7dbe55b..4262cd48 100644
          },
          "suse": {"BOOTPROTO": "static", "STARTMODE": "auto"},
      }
--- 
-2.40.0
-

0004-limit-permissions-on-def_log_file.patch

@@ -1,7 +1,7 @@
 From dfff374f66904e84fb07ca157ba010fac6b5f1de Mon Sep 17 00:00:00 2001
 From: Eduardo Otubo <otubo@redhat.com>
 Date: Fri, 7 May 2021 13:36:08 +0200
-Subject: [PATCH 04/10] limit permissions on def_log_file
+Subject: [PATCH] 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.
@@ -67,6 +67,3 @@ index 15d788f3..b6d16c9c 100644
  syslog_fix_perms: syslog:root
  
  # you can set passwords for a user or multiple users
--- 
-2.40.0
-

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

@@ -1,8 +1,8 @@
 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 05/10] Manual revert "Use Network-Manager and Netplan as
+Subject: [PATCH] Manual revert "Use Network-Manager and Netplan as default
- default renderers for RHEL and Fedora (#1465)"
+ 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.
@@ -90,6 +90,3 @@ index ea331f1c..bc52afa5 100644
  
  Network configuration tools
  ===========================
--- 
-2.40.0
-

0006-Revert-Add-native-NetworkManager-support-1224.patch

@@ -1,7 +1,7 @@
 From b1dd14ffafad2d2ca84326c525962b2ca086b292 Mon Sep 17 00:00:00 2001
 From: Ani Sinha <anisinha@redhat.com>
 Date: Wed, 22 Mar 2023 16:31:58 +0530
-Subject: [PATCH 06/10] Revert "Add native NetworkManager support (#1224)"
+Subject: [PATCH] Revert "Add native NetworkManager support (#1224)"
 
 This reverts commit feda344e6cf9d37b09bc13cf333a717d1654c26c.
 
@@ -1385,6 +1385,3 @@ index afd9056a..b735ea9e 100644
  
      @patch("cloudinit.subp.subp", return_value=("", ""))
      def test_bring_up_interfaces(
--- 
-2.40.0
-

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

@@ -1,8 +1,8 @@
 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 07/10] rhel: make sure previous-hostname file ends with a new
+Subject: [PATCH] rhel: make sure previous-hostname file ends with a new line
- line (#2108)
+ (#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
@@ -52,6 +52,3 @@ index d8cca015..457dacf4 100644
  antonyc
  aswinrajamannar
  beantaxi
--- 
-2.40.0
-

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

@@ -1,7 +1,7 @@
 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 08/10] Don't change permissions of netrules target (#2076)
+Subject: [PATCH] Don't change permissions of netrules target (#2076)
 
 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2182948
 
@@ -119,6 +119,3 @@ index e9fb0591..b1c89ce3 100644
          )
  
      def test_apply_network_config_ipv6_ub(self):
--- 
-2.40.0
-

0009-Make-user-vendor-data-sensitive-and-remove-log-permi.patch

@@ -1,8 +1,8 @@
 From d092efe0f437ad149f6d6e3a9f8b816c0f5c1c2a Mon Sep 17 00:00:00 2001
 From: James Falcon <james.falcon@canonical.com>
 Date: Wed, 26 Apr 2023 15:11:55 -0500
-Subject: [PATCH 09/10] Make user/vendor data sensitive and remove log
+Subject: [PATCH] Make user/vendor data sensitive and remove log permissions
- permissions (#2144)
+ (#2144)
 
 Because user data and vendor data may contain sensitive information,
 this commit ensures that any user data or vendor data written to
@@ -293,6 +293,3 @@ index 15a7e973..a61f9df9 100644
  
 -        assert mode == stat.S_IMODE(log_file.stat().mode)
 +        assert 0o640 == stat.S_IMODE(log_file.stat().mode)
--- 
-2.40.0
-

0010-Do-not-generate-dsa-and-ed25519-key-types-when-crypt.patch

@@ -1,8 +1,8 @@
 From 6bf6ceab79df97eb1c90b4df61f654bc0b2f598c Mon Sep 17 00:00:00 2001
 From: Ani Sinha <anisinha@redhat.com>
 Date: Tue, 2 May 2023 20:35:45 +0530
-Subject: [PATCH 10/10] Do not generate dsa and ed25519 key types when crypto
+Subject: [PATCH] Do not generate dsa and ed25519 key types when crypto FIPS
- FIPS mode is enabled (#2142)
+ mode is enabled (#2142)
 
 DSA and ED25519 key types are not supported when FIPS is enabled in crypto.
 Check if FIPS has been enabled on the system and if so, do not generate those
@@ -204,6 +204,3 @@ index 07142a86..17182d06 100644
  class TestLoadYaml(helpers.CiTestCase):
      mydefault = "7b03a8ebace993d806255121073fed52"
      with_logs = True
--- 
-2.40.0
-

0011-Revert-Manual-revert-Use-Network-Manager-and-Netplan.patch

@@ -0,0 +1,93 @@
+From 0b0632f6c084a8ce95b53cb5125dc0f4107e6968 Mon Sep 17 00:00:00 2001
+From: Ani Sinha <anisinha@redhat.com>
+Date: Thu, 4 May 2023 15:34:43 +0530
+Subject: [PATCH] Revert "Manual revert "Use Network-Manager and Netplan as
+ default renderers for RHEL and Fedora (#1465)""
+
+This reverts commit ecae81f98ce230266eb99671b74534a4ede660f0.
+
+This is patch 1 of the two patches that re-enables NM renderer. This change
+can be ignored while rebasing to latest upstream.
+
+X-downstream-only: true
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+---
+ cloudinit/net/renderers.py           |  1 +
+ config/cloud.cfg.tmpl                |  3 +++
+ doc/rtd/reference/network-config.rst | 16 ++++++++++++++--
+ 3 files changed, 18 insertions(+), 2 deletions(-)
+
+diff --git a/cloudinit/net/renderers.py b/cloudinit/net/renderers.py
+index c92b9dcf..022ff938 100644
+--- a/cloudinit/net/renderers.py
++++ b/cloudinit/net/renderers.py
+@@ -28,6 +28,7 @@ DEFAULT_PRIORITY = [
+     "eni",
+     "sysconfig",
+     "netplan",
++    "network-manager",
+     "freebsd",
+     "netbsd",
+     "openbsd",
+diff --git a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl
+index 12f32c51..7238c102 100644
+--- a/config/cloud.cfg.tmpl
++++ b/config/cloud.cfg.tmpl
+@@ -381,6 +381,9 @@ 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 bc52afa5..ea331f1c 100644
+--- a/doc/rtd/reference/network-config.rst
++++ b/doc/rtd/reference/network-config.rst
+@@ -176,6 +176,16 @@ 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
+ ---
+ 
+@@ -213,6 +223,7 @@ preference) is as follows:
+ - ENI
+ - Sysconfig
+ - Netplan
++- NetworkManager
+ - FreeBSD
+ - NetBSD
+ - OpenBSD
+@@ -223,6 +234,7 @@ 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
+@@ -232,8 +244,8 @@ supplying an updated configuration in cloud-config. ::
+ 
+   system_info:
+     network:
+-      renderers: ['netplan', 'eni', 'sysconfig', 'freebsd', 'netbsd', 'openbsd']
+-      activators: ['eni', 'netplan', 'networkd']
++      renderers: ['netplan', 'network-manager', 'eni', 'sysconfig', 'freebsd', 'netbsd', 'openbsd']
++      activators: ['eni', 'netplan', 'network-manager', 'networkd']
+ 
+ Network configuration tools
+ ===========================

0013-net-sysconfig-do-not-use-the-highest-autoconnect-pri.patch

@@ -0,0 +1,33 @@
+From 0a2c6b6118ffaf29694b3a51aff3a33298419c50 Mon Sep 17 00:00:00 2001
+From: Ani Sinha <anisinha@redhat.com>
+Date: Mon, 15 May 2023 19:15:12 +0530
+Subject: [PATCH] net/sysconfig: do not use the highest autoconnect priority
+
+Using the highest priority is a very big hammer that we may not want to use. We
+may want users to override the cloud init generated ifcfg files for custom
+configuration of interfaces. If cloud init uses the highest priority, nothing
+can beat it. Hence lower the priority to 120 allowing values from 121 to 999
+to be used by users if they want to use a custom interface nm keyfile.
+
+X-downstream-only: true
+
+Suggested-by: thaller@redhat.com
+fixes: c589da20eb92231 ("Setting highest autoconnect priority for network-scripts")
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+---
+ cloudinit/net/sysconfig.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
+index b8786fb7..1fe82412 100644
+--- a/cloudinit/net/sysconfig.py
++++ b/cloudinit/net/sysconfig.py
+@@ -317,7 +317,7 @@ class Renderer(renderer.Renderer):
+             "ONBOOT": True,
+             "USERCTL": False,
+             "BOOTPROTO": "none",
+-            "AUTOCONNECT_PRIORITY": 999
++            "AUTOCONNECT_PRIORITY": 120,
+         },
+         "suse": {"BOOTPROTO": "static", "STARTMODE": "auto"},
+     }

0014-net-sysconfig-cosmetic-fix-tox-formatting.patch

@@ -0,0 +1,43 @@
+From 603ad38bca7735eeb72217b4f169a4b4c42ac092 Mon Sep 17 00:00:00 2001
+From: Ani Sinha <anisinha@redhat.com>
+Date: Tue, 16 May 2023 16:08:21 +0530
+Subject: [PATCH] net/sysconfig: cosmetic - fix tox formatting
+
+recommended cloud-init code formatting was not enforced with an older downstream
+only change. This change fixes the formatting issue so that tox -e do_format
+does not complain. Changes are cosmetic.
+
+X-downstream-only: true
+
+fixes: b3b96bff187e9d ("Do not write NM_CONTROLLED=no in generated interface config files")
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+---
+ cloudinit/net/sysconfig.py | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
+index 1fe82412..fcce3e99 100644
+--- a/cloudinit/net/sysconfig.py
++++ b/cloudinit/net/sysconfig.py
+@@ -1025,15 +1025,15 @@ class Renderer(renderer.Renderer):
+         if sysconfig_path.endswith("network"):
+             util.ensure_dir(os.path.dirname(sysconfig_path))
+             netcfg = []
+-            for line in util.load_file(sysconfig_path, quiet=True).split('\n'):
+-                if 'cloud-init' in line:
++            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=')):
++                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'])
++            netcfg.extend([_make_header(), "NETWORKING=yes"])
+             if network_state.use_ipv6:
+                 netcfg.append("NETWORKING_IPV6=yes")
+                 netcfg.append("IPV6_AUTOCONF=no")

0015-nm-generate-ipv6-stateful-dhcp-config-at-par-with-sy.patch

@@ -0,0 +1,49 @@
+From 58d7574bca2b00d05d090c180f1345a2408cc700 Mon Sep 17 00:00:00 2001
+From: Ani Sinha <anisinha@redhat.com>
+Date: Mon, 22 May 2023 21:30:01 +0530
+Subject: [PATCH] nm: generate ipv6 stateful dhcp config at par with sysconfig
+ (#4115)
+
+The sysconfig renderer sets the following in the ifcfg file for IPV6 stateful
+DHCP configuration:
+
+ BOOTPROTO = "dhcp"
+ DHCPV6C = True
+ IPV6INIT = True
+ IPV6_AUTOCONF = False
+
+This should result in
+  [ipv6]
+  method=dhcp
+
+in the network manager generated keyfile as DHCPV6C is set and
+IPV6_AUTOCONF is not set. Unfortunately the network manager renderer
+deviates from this and generates:
+  [ipv6]
+  method=auto
+
+in it's rendered keyfile. This change fixes this deviation and sets the
+IPV6 dhcp stateful configuration in alignment with what is generated by the
+sysconfig renderer.
+
+RHBZ: 2207716
+
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+(cherry picked from commit ea573ba6fc25fe49a6a1a322eeb5259b6238d78b)
+---
+ cloudinit/net/network_manager.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cloudinit/net/network_manager.py b/cloudinit/net/network_manager.py
+index 53763d15..744c0cbb 100644
+--- a/cloudinit/net/network_manager.py
++++ b/cloudinit/net/network_manager.py
+@@ -72,7 +72,7 @@ class NMConnection:
+             "dhcp6": "auto",
+             "ipv6_slaac": "auto",
+             "ipv6_dhcpv6-stateless": "auto",
+-            "ipv6_dhcpv6-stateful": "auto",
++            "ipv6_dhcpv6-stateful": "dhcp",
+             "dhcp4": "auto",
+             "dhcp": "auto",
+         }

0016-network_manager-add-a-method-for-ipv6-static-IP-conf.patch

@@ -0,0 +1,31 @@
+From 018aa09f049791755dd746b533abb2464b08a92d Mon Sep 17 00:00:00 2001
+From: Ani Sinha <anisinha@redhat.com>
+Date: Mon, 22 May 2023 21:33:53 +0530
+Subject: [PATCH] network_manager: add a method for ipv6 static IP
+ configuration (#4127)
+
+The static IP configuration for IPv6 in the method_map is missing for
+network manager renderer. This is causing cloud-init to generate a keyfile with
+IPv6 method as "auto" instead of "manual". This fixes this issue.
+
+fixes: #4126
+RHBZ: 2196284
+
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+(cherry picked from commit 5d440856cb6d2b4c908015fe4eb7227615c17c8b)
+---
+ cloudinit/net/network_manager.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/cloudinit/net/network_manager.py b/cloudinit/net/network_manager.py
+index 744c0cbb..2752f52f 100644
+--- a/cloudinit/net/network_manager.py
++++ b/cloudinit/net/network_manager.py
+@@ -69,6 +69,7 @@ class NMConnection:
+ 
+         method_map = {
+             "static": "manual",
++            "static6": "manual",
+             "dhcp6": "auto",
+             "ipv6_slaac": "auto",
+             "ipv6_dhcpv6-stateless": "auto",

0017-net-sysconfig-enable-sysconfig-renderer-if-network-m.patch

@@ -0,0 +1,62 @@
+From 19adc5a0939fc1804b180333af5486e69d6af0ac Mon Sep 17 00:00:00 2001
+From: Ani Sinha <anisinha@redhat.com>
+Date: Mon, 22 May 2023 22:06:28 +0530
+Subject: [PATCH] net/sysconfig: enable sysconfig renderer if network manager
+ has ifcfg-rh plugin (#4132)
+
+Some distributions like RHEL does not have ifup and ifdown
+scripts that traditionally handled ifcfg-eth* files. Instead RHEL
+uses network manager with ifcfg-rh plugin to handle ifcfg
+scripts. Therefore, the sysconfig should check for the
+existence of ifcfg-rh plugin in addition to checking for the
+existence of ifup and ifdown scripts in order to determine if it
+can handle ifcfg files. If either the plugin or ifup/ifdown scripts
+are present, sysconfig renderer can be enabled.
+
+fixes: #4131
+RHBZ: 2194050
+
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+(cherry picked from commit 009dbf85a72a9077b2267d377b2ff46639fb3def)
+---
+ cloudinit/net/sysconfig.py | 19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+
+diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
+index fcce3e99..f2c7c92c 100644
+--- a/cloudinit/net/sysconfig.py
++++ b/cloudinit/net/sysconfig.py
+@@ -1,6 +1,7 @@
+ # This file is part of cloud-init. See LICENSE file for license information.
+ 
+ import copy
++import glob
+ import io
+ import os
+ import re
+@@ -1059,7 +1060,25 @@ def _supported_vlan_names(rdev, vid):
+ def available(target=None):
+     if not util.system_info()["variant"] in KNOWN_DISTROS:
+         return False
++    if available_sysconfig(target):
++        return True
++    if available_nm_ifcfg_rh(target):
++        return True
++    return False
++
++
++def available_nm_ifcfg_rh(target=None):
++    # The ifcfg-rh plugin of NetworkManager is installed.
++    # NetworkManager can handle the ifcfg files.
++    return glob.glob(
++        subp.target_path(
++            target,
++            "usr/lib*/NetworkManager/*/libnm-settings-plugin-ifcfg-rh.so",
++        )
++    )
++
+ 
++def available_sysconfig(target=None):
+     expected = ["ifup", "ifdown"]
+     search = ["/sbin", "/usr/sbin"]
+     for p in expected:

0018-network-manager-Set-higher-autoconnect-priority-for-.patch

@@ -0,0 +1,401 @@
+From f0cf9e52fd084c23f0552456e3b780b5c9c3313a Mon Sep 17 00:00:00 2001
+From: Ani Sinha <anisinha@redhat.com>
+Date: Tue, 23 May 2023 20:38:31 +0530
+Subject: [PATCH] network-manager: Set higher autoconnect priority for nm
+ keyfiles (#3671)
+
+cloud init generated keyfiles by network manager renderer for network
+interfaces can sometimes conflict with existing keyfiles that are left as an
+artifact of an upgrade process or are old user generated keyfiles. When two
+such keyfiles are present, the existing keyfile can take precedence over the
+cloud init generated keyfile making the later ineffective. Removing the old
+keyfile blindly by cloud init would also not be correct since there would be
+no way to enforce a different interface configuration if one needs it.
+
+This change adds an autoconnect-priority value for cloud init generated keyfile
+so that the cloud init configuration takes precedence over the existing old
+keyfile configuration in the default case. The priority values range from 0
+to 999. We set a value of 120 so that it would be high enough in the default
+case and result in cloud init keyfile to take precedence but not too high so
+that if the user generated keyfile needs to take precedence, the user can do
+so by using a higher value than the one used by cloud init key file, between
+the values 121 and 999.
+
+RHBZ: 2196231
+
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+(cherry picked from commit f663e94ac50bc518e694cbd167fdab216fcff029)
+---
+ cloudinit/net/network_manager.py              |  1 +
+ tests/unittests/cmd/devel/test_net_convert.py |  1 +
+ .../cloud-init-encc000.2653.nmconnection      |  1 +
+ .../cloud-init-encc000.nmconnection           |  1 +
+ .../cloud-init-zz-all-en.nmconnection         |  1 +
+ .../cloud-init-zz-all-eth.nmconnection        |  1 +
+ tests/unittests/test_net.py                   | 36 +++++++++++++++++++
+ 7 files changed, 42 insertions(+)
+
+diff --git a/cloudinit/net/network_manager.py b/cloudinit/net/network_manager.py
+index 2752f52f..ca216928 100644
+--- a/cloudinit/net/network_manager.py
++++ b/cloudinit/net/network_manager.py
+@@ -43,6 +43,7 @@ class NMConnection:
+         self.config["connection"] = {
+             "id": f"cloud-init {con_id}",
+             "uuid": str(uuid.uuid5(CI_NM_UUID, con_id)),
++            "autoconnect-priority": "120",
+         }
+ 
+         # This is not actually used anywhere, but may be useful in future
+diff --git a/tests/unittests/cmd/devel/test_net_convert.py b/tests/unittests/cmd/devel/test_net_convert.py
+index 100aa8de..71654750 100644
+--- a/tests/unittests/cmd/devel/test_net_convert.py
++++ b/tests/unittests/cmd/devel/test_net_convert.py
+@@ -74,6 +74,7 @@ SAMPLE_NETWORK_MANAGER_CONTENT = """\
+ [connection]
+ id=cloud-init eth0
+ uuid=1dd9a779-d327-56e1-8454-c65e2556c12c
++autoconnect-priority=120
+ type=ethernet
+ interface-name=eth0
+ 
+diff --git a/tests/unittests/net/artifacts/no_matching_mac/etc/NetworkManager/system-connections/cloud-init-encc000.2653.nmconnection b/tests/unittests/net/artifacts/no_matching_mac/etc/NetworkManager/system-connections/cloud-init-encc000.2653.nmconnection
+index 80483d4f..f44485d2 100644
+--- a/tests/unittests/net/artifacts/no_matching_mac/etc/NetworkManager/system-connections/cloud-init-encc000.2653.nmconnection
++++ b/tests/unittests/net/artifacts/no_matching_mac/etc/NetworkManager/system-connections/cloud-init-encc000.2653.nmconnection
+@@ -3,6 +3,7 @@
+ [connection]
+ id=cloud-init encc000.2653
+ uuid=116aaf19-aabc-50ea-b480-e9aee18bda59
++autoconnect-priority=120
+ type=vlan
+ interface-name=encc000.2653
+ 
+diff --git a/tests/unittests/net/artifacts/no_matching_mac/etc/NetworkManager/system-connections/cloud-init-encc000.nmconnection b/tests/unittests/net/artifacts/no_matching_mac/etc/NetworkManager/system-connections/cloud-init-encc000.nmconnection
+index 3368388d..fbdfbc65 100644
+--- a/tests/unittests/net/artifacts/no_matching_mac/etc/NetworkManager/system-connections/cloud-init-encc000.nmconnection
++++ b/tests/unittests/net/artifacts/no_matching_mac/etc/NetworkManager/system-connections/cloud-init-encc000.nmconnection
+@@ -3,6 +3,7 @@
+ [connection]
+ id=cloud-init encc000
+ uuid=f869ebd3-f175-5747-bf02-d0d44d687248
++autoconnect-priority=120
+ type=ethernet
+ interface-name=encc000
+ 
+diff --git a/tests/unittests/net/artifacts/no_matching_mac/etc/NetworkManager/system-connections/cloud-init-zz-all-en.nmconnection b/tests/unittests/net/artifacts/no_matching_mac/etc/NetworkManager/system-connections/cloud-init-zz-all-en.nmconnection
+index 16120bc1..dce56c7d 100644
+--- a/tests/unittests/net/artifacts/no_matching_mac/etc/NetworkManager/system-connections/cloud-init-zz-all-en.nmconnection
++++ b/tests/unittests/net/artifacts/no_matching_mac/etc/NetworkManager/system-connections/cloud-init-zz-all-en.nmconnection
+@@ -3,6 +3,7 @@
+ [connection]
+ id=cloud-init zz-all-en
+ uuid=159daec9-cba3-5101-85e7-46d831857f43
++autoconnect-priority=120
+ type=ethernet
+ interface-name=zz-all-en
+ 
+diff --git a/tests/unittests/net/artifacts/no_matching_mac/etc/NetworkManager/system-connections/cloud-init-zz-all-eth.nmconnection b/tests/unittests/net/artifacts/no_matching_mac/etc/NetworkManager/system-connections/cloud-init-zz-all-eth.nmconnection
+index df44d546..ee436bf2 100644
+--- a/tests/unittests/net/artifacts/no_matching_mac/etc/NetworkManager/system-connections/cloud-init-zz-all-eth.nmconnection
++++ b/tests/unittests/net/artifacts/no_matching_mac/etc/NetworkManager/system-connections/cloud-init-zz-all-eth.nmconnection
+@@ -3,6 +3,7 @@
+ [connection]
+ id=cloud-init zz-all-eth
+ uuid=23a83d8a-d7db-5133-a77b-e68a6ac61ec9
++autoconnect-priority=120
+ type=ethernet
+ interface-name=zz-all-eth
+ 
+diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
+index 0f523ff8..7abe61b9 100644
+--- a/tests/unittests/test_net.py
++++ b/tests/unittests/test_net.py
+@@ -631,6 +631,7 @@ dns = none
+ [connection]
+ id=cloud-init eth0
+ uuid=1dd9a779-d327-56e1-8454-c65e2556c12c
++autoconnect-priority=120
+ type=ethernet
+ 
+ [user]
+@@ -1118,6 +1119,7 @@ NETWORK_CONFIGS = {
+                 [connection]
+                 id=cloud-init eth1
+                 uuid=3c50eb47-7260-5a6d-801d-bd4f587d6b58
++                autoconnect-priority=120
+                 type=ethernet
+ 
+                 [user]
+@@ -1135,6 +1137,7 @@ NETWORK_CONFIGS = {
+                 [connection]
+                 id=cloud-init eth99
+                 uuid=b1b88000-1f03-5360-8377-1a2205efffb4
++                autoconnect-priority=120
+                 type=ethernet
+ 
+                 [user]
+@@ -1234,6 +1237,7 @@ NETWORK_CONFIGS = {
+                 [connection]
+                 id=cloud-init iface0
+                 uuid=8ddfba48-857c-5e86-ac09-1b43eae0bf70
++                autoconnect-priority=120
+                 type=ethernet
+                 interface-name=iface0
+ 
+@@ -1364,6 +1368,7 @@ NETWORK_CONFIGS = {
+                 [connection]
+                 id=cloud-init iface0
+                 uuid=8ddfba48-857c-5e86-ac09-1b43eae0bf70
++                autoconnect-priority=120
+                 type=ethernet
+                 interface-name=iface0
+ 
+@@ -1404,6 +1409,7 @@ NETWORK_CONFIGS = {
+                 [connection]
+                 id=cloud-init iface0
+                 uuid=8ddfba48-857c-5e86-ac09-1b43eae0bf70
++                autoconnect-priority=120
+                 type=ethernet
+                 interface-name=iface0
+ 
+@@ -1504,6 +1510,7 @@ NETWORK_CONFIGS = {
+                 [connection]
+                 id=cloud-init iface0
+                 uuid=8ddfba48-857c-5e86-ac09-1b43eae0bf70
++                autoconnect-priority=120
+                 type=ethernet
+                 interface-name=iface0
+ 
+@@ -1734,6 +1741,7 @@ NETWORK_CONFIGS = {
+                 [connection]
+                 id=cloud-init iface0
+                 uuid=8ddfba48-857c-5e86-ac09-1b43eae0bf70
++                autoconnect-priority=120
+                 type=ethernet
+                 interface-name=iface0
+ 
+@@ -1845,6 +1853,7 @@ NETWORK_CONFIGS = {
+                 [connection]
+                 id=cloud-init iface0
+                 uuid=8ddfba48-857c-5e86-ac09-1b43eae0bf70
++                autoconnect-priority=120
+                 type=ethernet
+                 interface-name=iface0
+ 
+@@ -1967,6 +1976,7 @@ NETWORK_CONFIGS = {
+                 [connection]
+                 id=cloud-init iface0
+                 uuid=8ddfba48-857c-5e86-ac09-1b43eae0bf70
++                autoconnect-priority=120
+                 type=ethernet
+                 interface-name=iface0
+ 
+@@ -2043,6 +2053,7 @@ NETWORK_CONFIGS = {
+                 [connection]
+                 id=cloud-init iface0
+                 uuid=8ddfba48-857c-5e86-ac09-1b43eae0bf70
++                autoconnect-priority=120
+                 type=ethernet
+                 interface-name=iface0
+ 
+@@ -2507,6 +2518,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+                 [connection]
+                 id=cloud-init eth3
+                 uuid=b7e95dda-7746-5bf8-bf33-6e5f3c926790
++                autoconnect-priority=120
+                 type=ethernet
+                 slave-type=bridge
+                 master=dee46ce4-af7a-5e7c-aa08-b25533ae9213
+@@ -2526,6 +2538,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+                 [connection]
+                 id=cloud-init eth5
+                 uuid=5fda13c7-9942-5e90-a41b-1d043bd725dc
++                autoconnect-priority=120
+                 type=ethernet
+ 
+                 [user]
+@@ -2547,6 +2560,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+                 [connection]
+                 id=cloud-init ib0
+                 uuid=11a1dda7-78b4-5529-beba-d9b5f549ad7b
++                autoconnect-priority=120
+                 type=infiniband
+ 
+                 [user]
+@@ -2571,6 +2585,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+                 [connection]
+                 id=cloud-init bond0.200
+                 uuid=88984a9c-ff22-5233-9267-86315e0acaa7
++                autoconnect-priority=120
+                 type=vlan
+                 interface-name=bond0.200
+ 
+@@ -2594,6 +2609,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+                 [connection]
+                 id=cloud-init eth0
+                 uuid=1dd9a779-d327-56e1-8454-c65e2556c12c
++                autoconnect-priority=120
+                 type=ethernet
+ 
+                 [user]
+@@ -2611,6 +2627,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+                 [connection]
+                 id=cloud-init eth4
+                 uuid=e27e4959-fb50-5580-b9a4-2073554627b9
++                autoconnect-priority=120
+                 type=ethernet
+                 slave-type=bridge
+                 master=dee46ce4-af7a-5e7c-aa08-b25533ae9213
+@@ -2630,6 +2647,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+                 [connection]
+                 id=cloud-init eth1
+                 uuid=3c50eb47-7260-5a6d-801d-bd4f587d6b58
++                autoconnect-priority=120
+                 type=ethernet
+                 slave-type=bond
+                 master=54317911-f840-516b-a10d-82cb4c1f075c
+@@ -2649,6 +2667,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+                 [connection]
+                 id=cloud-init br0
+                 uuid=dee46ce4-af7a-5e7c-aa08-b25533ae9213
++                autoconnect-priority=120
+                 type=bridge
+                 interface-name=br0
+ 
+@@ -2680,6 +2699,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+                 [connection]
+                 id=cloud-init eth0.101
+                 uuid=b5acec5e-db80-5935-8b02-0d5619fc42bf
++                autoconnect-priority=120
+                 type=vlan
+                 interface-name=eth0.101
+ 
+@@ -2708,6 +2728,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+                 [connection]
+                 id=cloud-init bond0
+                 uuid=54317911-f840-516b-a10d-82cb4c1f075c
++                autoconnect-priority=120
+                 type=bond
+                 interface-name=bond0
+ 
+@@ -2732,6 +2753,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
+                 [connection]
+                 id=cloud-init eth2
+                 uuid=5559a242-3421-5fdd-896e-9cb8313d5804
++                autoconnect-priority=120
+                 type=ethernet
+                 slave-type=bond
+                 master=54317911-f840-516b-a10d-82cb4c1f075c
+@@ -3257,6 +3279,7 @@ iface bond0 inet6 static
+                 [connection]
+                 id=cloud-init bond0s0
+                 uuid=09d0b5b9-67e7-5577-a1af-74d1cf17a71e
++                autoconnect-priority=120
+                 type=ethernet
+                 slave-type=bond
+                 master=54317911-f840-516b-a10d-82cb4c1f075c
+@@ -3276,6 +3299,7 @@ iface bond0 inet6 static
+                 [connection]
+                 id=cloud-init bond0s1
+                 uuid=4d9aca96-b515-5630-ad83-d13daac7f9d0
++                autoconnect-priority=120
+                 type=ethernet
+                 slave-type=bond
+                 master=54317911-f840-516b-a10d-82cb4c1f075c
+@@ -3295,6 +3319,7 @@ iface bond0 inet6 static
+                 [connection]
+                 id=cloud-init bond0
+                 uuid=54317911-f840-516b-a10d-82cb4c1f075c
++                autoconnect-priority=120
+                 type=bond
+                 interface-name=bond0
+ 
+@@ -3421,6 +3446,7 @@ iface bond0 inet6 static
+                 [connection]
+                 id=cloud-init en0.99
+                 uuid=f594e2ed-f107-51df-b225-1dc530a5356b
++                autoconnect-priority=120
+                 type=vlan
+                 interface-name=en0.99
+ 
+@@ -3453,6 +3479,7 @@ iface bond0 inet6 static
+                 [connection]
+                 id=cloud-init en0
+                 uuid=e0ca478b-8d84-52ab-8fae-628482c629b5
++                autoconnect-priority=120
+                 type=ethernet
+ 
+                 [user]
+@@ -3580,6 +3607,7 @@ iface bond0 inet6 static
+                 [connection]
+                 id=cloud-init br0
+                 uuid=dee46ce4-af7a-5e7c-aa08-b25533ae9213
++                autoconnect-priority=120
+                 type=bridge
+                 interface-name=br0
+ 
+@@ -3604,6 +3632,7 @@ iface bond0 inet6 static
+                 [connection]
+                 id=cloud-init eth0
+                 uuid=1dd9a779-d327-56e1-8454-c65e2556c12c
++                autoconnect-priority=120
+                 type=ethernet
+                 slave-type=bridge
+                 master=dee46ce4-af7a-5e7c-aa08-b25533ae9213
+@@ -3628,6 +3657,7 @@ iface bond0 inet6 static
+                 [connection]
+                 id=cloud-init eth1
+                 uuid=3c50eb47-7260-5a6d-801d-bd4f587d6b58
++                autoconnect-priority=120
+                 type=ethernet
+                 slave-type=bridge
+                 master=dee46ce4-af7a-5e7c-aa08-b25533ae9213
+@@ -3782,6 +3812,7 @@ iface bond0 inet6 static
+                 [connection]
+                 id=cloud-init eth0
+                 uuid=1dd9a779-d327-56e1-8454-c65e2556c12c
++                autoconnect-priority=120
+                 type=ethernet
+ 
+                 [user]
+@@ -3804,6 +3835,7 @@ iface bond0 inet6 static
+                 [connection]
+                 id=cloud-init eth1
+                 uuid=3c50eb47-7260-5a6d-801d-bd4f587d6b58
++                autoconnect-priority=120
+                 type=ethernet
+ 
+                 [user]
+@@ -3826,6 +3858,7 @@ iface bond0 inet6 static
+                 [connection]
+                 id=cloud-init eth2
+                 uuid=5559a242-3421-5fdd-896e-9cb8313d5804
++                autoconnect-priority=120
+                 type=ethernet
+ 
+                 [user]
+@@ -5688,6 +5721,7 @@ class TestNetworkManagerRendering(CiTestCase):
+                 [connection]
+                 id=cloud-init eth1000
+                 uuid=8c517500-0c95-5308-9c8a-3092eebc44eb
++                autoconnect-priority=120
+                 type=ethernet
+ 
+                 [user]
+@@ -5742,6 +5776,7 @@ class TestNetworkManagerRendering(CiTestCase):
+                 [connection]
+                 id=cloud-init interface0
+                 uuid=8b6862ed-dbd6-5830-93f7-a91451c13828
++                autoconnect-priority=120
+                 type=ethernet
+ 
+                 [user]
+@@ -5778,6 +5813,7 @@ class TestNetworkManagerRendering(CiTestCase):
+                 [connection]
+                 id=cloud-init eth0
+                 uuid=1dd9a779-d327-56e1-8454-c65e2556c12c
++                autoconnect-priority=120
+                 type=ethernet
+                 interface-name=eth0
+ 

0019-Set-default-renderer-as-sysconfig-for-c9s-RHEL-9.patch

@@ -0,0 +1,42 @@
+From 5394e28e896e9d18db6d359190bfb58dcbdb2646 Mon Sep 17 00:00:00 2001
+From: Ani Sinha <anisinha@redhat.com>
+Date: Tue, 23 May 2023 21:15:30 +0530
+Subject: [PATCH] Set default renderer as sysconfig for c9s/RHEL 9
+
+Currently, network manager is disabled on c9s and RHEL 9 and therefore
+sysconfig is used as the primary renderer for network configuration on those
+distribution flavors. We do not want to change this for c9s or RHEL 9 even when
+network-manager renderer is re-enabled. NM was re-enabled with the following
+commit:
+5822f72230a58d ("Revert "Revert "Add native NetworkManager support (#1224)""")
+
+This change bumps up the priority for sysconfig renderer so that it is used as
+the primary renderer on c9s/RHEL 9 and other downstream distributions derived
+from them. For c10s or RHEL 10, we might revert this change so that
+network-manager again becomes the primary renderer for those distributions.
+
+X-downstream-only: true
+
+fixes: 0b0632f6c0 ("Revert "Manual revert "Use Network-Manager and Netplan as default renderers for RHEL and Fedora (#1465)")
+fixes: 7703aa98b89 ("Use Network-Manager and Netplan as default renderers for RHEL and Fedora (#1465)")
+
+RHBZ:2209349
+
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+---
+ config/cloud.cfg.tmpl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl
+index 7238c102..22c6654c 100644
+--- a/config/cloud.cfg.tmpl
++++ b/config/cloud.cfg.tmpl
+@@ -383,7 +383,7 @@ system_info:
+       renderers: ['freebsd']
+ {% elif variant in ["fedora"] or is_rhel %}
+    network:
+-      renderers: ['netplan', 'network-manager', 'networkd', 'sysconfig', 'eni']
++      renderers: ['sysconfig', 'eni', 'netplan', 'network-manager', 'networkd']
+ {% elif variant == "openmandriva" %}
+    network:
+       renderers: ['network-manager', 'networkd']

cloud-init.spec

@@ -1,6 +1,6 @@
 Name:           cloud-init
 Version:        23.1.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Cloud instance init scripts
 License:        ASL 2.0 or GPLv3
 URL:            http://launchpad.net/cloud-init
@@ -18,6 +18,15 @@ Patch7: 0007-rhel-make-sure-previous-hostname-file-ends-with-a-ne.patch
 Patch8: 0008-Don-t-change-permissions-of-netrules-target-2076.patch
 Patch9: 0009-Make-user-vendor-data-sensitive-and-remove-log-permi.patch
 Patch10: 0010-Do-not-generate-dsa-and-ed25519-key-types-when-crypt.patch
+Patch11: 0011-Revert-Manual-revert-Use-Network-Manager-and-Netplan.patch
+Patch12: 0012-Revert-Revert-Add-native-NetworkManager-support-1224.patch
+Patch13: 0013-net-sysconfig-do-not-use-the-highest-autoconnect-pri.patch
+Patch14: 0014-net-sysconfig-cosmetic-fix-tox-formatting.patch
+Patch15: 0015-nm-generate-ipv6-stateful-dhcp-config-at-par-with-sy.patch
+Patch16: 0016-network_manager-add-a-method-for-ipv6-static-IP-conf.patch
+Patch17: 0017-net-sysconfig-enable-sysconfig-renderer-if-network-m.patch
+Patch18: 0018-network-manager-Set-higher-autoconnect-priority-for-.patch
+Patch19: 0019-Set-default-renderer-as-sysconfig-for-c9s-RHEL-9.patch
 
 BuildArch:      noarch
 
@@ -207,6 +216,18 @@ fi
 %config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf
 
 %changelog
+* Tue Jun 06 2023 Camilla Conte <cconte@redhat.com> - 23.1.1-6
+- 0011-Revert-Manual-revert-Use-Network-Manager-and-Netplan.patch
+- 0012-Revert-Revert-Add-native-NetworkManager-support-1224.patch
+- 0013-net-sysconfig-do-not-use-the-highest-autoconnect-pri.patch
+- 0014-net-sysconfig-cosmetic-fix-tox-formatting.patch
+- 0015-nm-generate-ipv6-stateful-dhcp-config-at-par-with-sy.patch [bz#2207716]
+- 0016-network_manager-add-a-method-for-ipv6-static-IP-conf.patch [bz#2196284]
+- 0017-net-sysconfig-enable-sysconfig-renderer-if-network-m.patch [bz#2194050]
+- 0018-network-manager-Set-higher-autoconnect-priority-for-.patch [bz#2196231]
+- 0019-Set-default-renderer-as-sysconfig-for-c9s-RHEL-9.patch [bz#2209349]
+- Resolves: bz#2118235 bz#2194050 bz#2196231 bz#2196284 bz#2207716 bz#2209349
+
 * Tue May 16 2023 Camilla Conte <cconte@redhat.com> - 23.1.1-5
 - 0010-Do-not-generate-dsa-and-ed25519-key-types-when-crypt.patch [bz#2187164]
 - Resolves: bz#2187164