43 lines
1.8 KiB
Diff
43 lines
1.8 KiB
Diff
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']
|