76 lines
2.9 KiB
Diff
76 lines
2.9 KiB
Diff
|
From c063021168dee7937281decd8f9b601f49a7d0f3 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||
|
|
Date: Mon, 8 Aug 2022 10:02:17 +0200
|
||
|
|
Subject: [PATCH 2/3] Revert "Use Network-Manager and Netplan as default
|
||
|
|
renderers for RHEL and Fedora (#1465)"
|
||
|
|
|
||
|
|
RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||
|
|
RH-MergeRequest: 31: Revert "Revert "Setting highest autoconnect priority for network-scripts""
|
||
|
|
RH-Commit: [2/3] bd662b768dc694c748cab9e36bc5ff0eb009e128 (eesposit/cloud-init-centos-)
|
||
|
|
RH-Bugzilla: 2107463 2104389 2117532 2098501
|
||
|
|
RH-Acked-by: Eduardo Otubo <otubo@redhat.com>
|
||
|
|
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||
|
|
RH-Acked-by: Mohamed Gamal Morsy <mmorsy@redhat.com>
|
||
|
|
|
||
|
|
As NM is reverted, remove also documentation and any trace of it.
|
||
|
|
This reverts commit bbd9f47a7988e15a2823b065cd539d7c9562d77e.
|
||
|
|
|
||
|
|
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||
|
|
---
|
||
|
|
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 <https://networkmanager.dev>`_ 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.31.1
|
||
|
|
|