From 02e7b89c157f8c3243f0d91cf5652cf27db44b72 Mon Sep 17 00:00:00 2001 From: Emanuele Giuseppe Esposito Date: Mon, 8 Aug 2022 10:10:26 +0200 Subject: [PATCH 2/2] Revert "Use Network-Manager and Netplan as default renderers for RHEL and Fedora (#1465)" RH-Author: Emanuele Giuseppe Esposito RH-MergeRequest: 81: Revert "Use Network-Manager and Netplan as default renderers for RHEL and Fedora (#1465)" RH-Commit: [2/2] 746b2e33356376e250b799261031676174e8ccc9 RH-Bugzilla: 2107464 2110066 2117526 2104393 2098624 RH-Acked-by: Eduardo Otubo RH-Acked-by: Vitaly Kuznetsov RH-Acked-by: Mohamed Gamal Morsy As NM is reverted, remove also documentation and any trace of it. This reverts commit 13ded463a6a0b1b0bf0dffc0a997f006dd25c4f3. Signed-off-by: Emanuele Giuseppe Esposito --- config/cloud.cfg.tmpl | 3 --- doc/rtd/topics/network-config.rst | 12 +----------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl index f4d2fd14..80ab4f96 100644 --- a/config/cloud.cfg.tmpl +++ b/config/cloud.cfg.tmpl @@ -353,7 +353,4 @@ system_info: {% elif variant in ["dragonfly"] %} network: renderers: ['freebsd'] -{% elif variant in ["rhel", "fedora"] %} - network: - renderers: ['netplan', 'network-manager', 'networkd', 'sysconfig', 'eni'] {% endif %} diff --git a/doc/rtd/topics/network-config.rst b/doc/rtd/topics/network-config.rst index f503caab..c461a3fe 100644 --- a/doc/rtd/topics/network-config.rst +++ b/doc/rtd/topics/network-config.rst @@ -188,15 +188,6 @@ generated configuration into an internal network configuration state. From 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 ``/etc/NetworkManager``. - -It is the default for a number of Linux distributions, notably Fedora; -CentOS/RHEL; and derivatives. - - **ENI** /etc/network/interfaces or ``ENI`` is supported by the ``ifupdown`` package @@ -224,7 +215,6 @@ is as follows: - ENI - Sysconfig - Netplan -- NetworkManager When applying the policy, `Cloud-init`_ checks if the current instance has the correct binaries and paths to support the renderer. The first renderer that @@ -233,7 +223,7 @@ supplying an updated configuration in cloud-config. :: system_info: network: - renderers: ['netplan', 'network-manager', 'eni', 'sysconfig', 'freebsd', 'netbsd', 'openbsd'] + renderers: ['netplan', 'eni', 'sysconfig', 'freebsd', 'netbsd', 'openbsd'] Network Configuration Tools -- 2.27.0