59e311
From c063021168dee7937281decd8f9b601f49a7d0f3 Mon Sep 17 00:00:00 2001
59e311
From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
59e311
Date: Mon, 8 Aug 2022 10:02:17 +0200
59e311
Subject: [PATCH 2/3] Revert "Use Network-Manager and Netplan as default
59e311
 renderers for RHEL and Fedora (#1465)"
59e311
59e311
RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
59e311
RH-MergeRequest: 31: Revert "Revert "Setting highest autoconnect priority for network-scripts""
59e311
RH-Commit: [2/3] bd662b768dc694c748cab9e36bc5ff0eb009e128 (eesposit/cloud-init-centos-)
59e311
RH-Bugzilla: 2107463 2104389 2117532 2098501
59e311
RH-Acked-by: Eduardo Otubo <otubo@redhat.com>
59e311
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
59e311
RH-Acked-by: Mohamed Gamal Morsy <mmorsy@redhat.com>
59e311
59e311
As NM is reverted, remove also documentation and any trace of it.
59e311
This reverts commit bbd9f47a7988e15a2823b065cd539d7c9562d77e.
59e311
59e311
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
59e311
---
59e311
 config/cloud.cfg.tmpl             |  3 ---
59e311
 doc/rtd/topics/network-config.rst | 12 +-----------
59e311
 2 files changed, 1 insertion(+), 14 deletions(-)
59e311
59e311
diff --git a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl
59e311
index f4d2fd14..80ab4f96 100644
59e311
--- a/config/cloud.cfg.tmpl
59e311
+++ b/config/cloud.cfg.tmpl
59e311
@@ -353,7 +353,4 @@ system_info:
59e311
 {% elif variant in ["dragonfly"] %}
59e311
    network:
59e311
       renderers: ['freebsd']
59e311
-{% elif variant in ["rhel", "fedora"] %}
59e311
-   network:
59e311
-      renderers: ['netplan', 'network-manager', 'networkd', 'sysconfig', 'eni']
59e311
 {% endif %}
59e311
diff --git a/doc/rtd/topics/network-config.rst b/doc/rtd/topics/network-config.rst
59e311
index f503caab..c461a3fe 100644
59e311
--- a/doc/rtd/topics/network-config.rst
59e311
+++ b/doc/rtd/topics/network-config.rst
59e311
@@ -188,15 +188,6 @@ generated configuration into an internal network configuration state. From
59e311
 this state `Cloud-init`_ delegates rendering of the configuration to Distro
59e311
 supported formats.  The following ``renderers`` are supported in cloud-init:
59e311
 
59e311
-- **NetworkManager**
59e311
-
59e311
-`NetworkManager <https://networkmanager.dev>`_ is the standard Linux network
59e311
-configuration tool suite. It supports a wide range of networking setups.
59e311
-Configuration is typically stored in ``/etc/NetworkManager``.
59e311
-
59e311
-It is the default for a number of Linux distributions, notably Fedora;
59e311
-CentOS/RHEL; and derivatives.
59e311
-
59e311
 - **ENI**
59e311
 
59e311
 /etc/network/interfaces or ``ENI`` is supported by the ``ifupdown`` package
59e311
@@ -224,7 +215,6 @@ is as follows:
59e311
 - ENI
59e311
 - Sysconfig
59e311
 - Netplan
59e311
-- NetworkManager
59e311
 
59e311
 When applying the policy, `Cloud-init`_ checks if the current instance has the
59e311
 correct binaries and paths to support the renderer.  The first renderer that
59e311
@@ -233,7 +223,7 @@ supplying an updated configuration in cloud-config. ::
59e311
 
59e311
   system_info:
59e311
     network:
59e311
-      renderers: ['netplan', 'network-manager', 'eni', 'sysconfig', 'freebsd', 'netbsd', 'openbsd']
59e311
+      renderers: ['netplan', 'eni', 'sysconfig', 'freebsd', 'netbsd', 'openbsd']
59e311
 
59e311
 
59e311
 Network Configuration Tools
59e311
-- 
59e311
2.31.1
59e311