From b813d8b59c46148dcbc7ff9f36e2aac7cce38373 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@fedoraproject.org>
Date: Tue, 22 Feb 2022 07:20:17 -0500
Subject: [PATCH] net: Prefer NetworkManager renderer by default

NetworkManager is used by default on a variety of Linux distributions,
and exists as a cross-distribution network management service.

Signed-off-by: Neal Gompa <ngompa@fedoraproject.org>
---
 cloudinit/net/renderers.py  | 2 +-
 tests/unittests/test_net.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cloudinit/net/renderers.py b/cloudinit/net/renderers.py
index 7edc34b5..d958c652 100644
--- a/cloudinit/net/renderers.py
+++ b/cloudinit/net/renderers.py
@@ -27,10 +27,10 @@ NAME_TO_RENDERER = {
 }
 
 DEFAULT_PRIORITY = [
+    "network-manager",
     "eni",
     "sysconfig",
     "netplan",
-    "network-manager",
     "freebsd",
     "netbsd",
     "openbsd",
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
index 9552ac12..668f2c45 100644
--- a/tests/unittests/test_net.py
+++ b/tests/unittests/test_net.py
@@ -7194,8 +7194,8 @@ class TestRenderersSelect:
             ("netplan", True, False, False, False, False),
             # -netplan -ifupdown +sys -nm -networkd selects sysconfig
             ("sysconfig", False, False, True, False, False),
-            # -netplan -ifupdown +sys +nm -networkd selects sysconfig
-            ("sysconfig", False, False, True, True, False),
+            # -netplan -ifupdown +sys +nm -networkd selects network-manager
+            ("network-manager", False, False, True, True, False),
             # -netplan -ifupdown -sys +nm -networkd selects nm
             ("network-manager", False, False, False, True, False),
             # -netplan -ifupdown -sys +nm +networkd selects nm
-- 
2.34.1