sailesh1993 / rpms / cloud-init

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