* Wed Aug 17 2022 Miroslav Rezanina <mrezanin@redhat.com> - 22.1-5
- ci-Revert-Add-native-NetworkManager-support-1224.patch [bz#2107463 bz#2104389 bz#2117532 bz#2098501] - ci-Revert-Use-Network-Manager-and-Netplan-as-default-re.patch [bz#2107463 bz#2104389 bz#2117532 bz#2098501] - ci-Revert-Revert-Setting-highest-autoconnect-priority-f.patch [bz#2107463 bz#2104389 bz#2117532 bz#2098501] - Resolves: bz#2107463 ([RHEL-9.1] Cannot run sysconfig when changing the priority of network renderers) - Resolves: bz#2104389 ([RHEL-9.1]Failed to config static IP and IPv6 according to VMware Customization Config File) - Resolves: bz#2117532 ([RHEL9.1] Revert patch of configuring networking by NM keyfiles) - Resolves: bz#2098501 ([RHEL-9.1] IPv6 not workable when cloud-init configure network using NM keyfiles)
This commit is contained in:
Miroslav Rezanina
parent
d43312c1e3
commit
92f60f1161
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,37 @@
|
|||
From c843f5cf7152846da3422185a6ad344dd47604e6 Mon Sep 17 00:00:00 2001
|
||||
From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||||
Date: Mon, 8 Aug 2022 10:02:48 +0200
|
||||
Subject: [PATCH 3/3] Revert "Revert "Setting highest autoconnect priority for
|
||||
network-scripts""
|
||||
|
||||
RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||||
RH-MergeRequest: 31: Revert "Revert "Setting highest autoconnect priority for network-scripts""
|
||||
RH-Commit: [3/3] 09b83fb559675a2fcd4fc5394b251f034b92c1bc (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>
|
||||
|
||||
Reverting NM means we also need to restore this patch
|
||||
This reverts commit 0eba5c6194017ef493a735cb24757c57d8af7b59.
|
||||
|
||||
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||||
---
|
||||
cloudinit/net/sysconfig.py | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
|
||||
index d8c53312..b50035b5 100644
|
||||
--- a/cloudinit/net/sysconfig.py
|
||||
+++ b/cloudinit/net/sysconfig.py
|
||||
@@ -337,6 +337,7 @@ class Renderer(renderer.Renderer):
|
||||
"ONBOOT": True,
|
||||
"USERCTL": False,
|
||||
"BOOTPROTO": "none",
|
||||
+ "AUTOCONNECT_PRIORITY": 999
|
||||
},
|
||||
"suse": {"BOOTPROTO": "static", "STARTMODE": "auto"},
|
||||
}
|
||||
--
|
||||
2.31.1
|
||||
|
||||
|
|
@ -0,0 +1,75 @@
|
|||
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
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
Name: cloud-init
|
||||
Version: 22.1
|
||||
Release: 4%{?dist}
|
||||
Release: 5%{?dist}
|
||||
Summary: Cloud instance init scripts
|
||||
License: ASL 2.0 or GPLv3
|
||||
URL: http://launchpad.net/cloud-init
|
||||
|
|
@ -31,6 +31,21 @@ Patch13: ci-cc_set_hostname-do-not-write-localhost-when-no-hostn.patch
|
|||
Patch14: ci-Honor-system-locale-for-RHEL-1355.patch
|
||||
# For bz#2096270 - Adjust udev/rules default path[rhel-9]
|
||||
Patch15: ci-setup.py-adjust-udev-rules-default-path-1513.patch
|
||||
# For bz#2107463 - [RHEL-9.1] Cannot run sysconfig when changing the priority of network renderers
|
||||
# For bz#2104389 - [RHEL-9.1]Failed to config static IP and IPv6 according to VMware Customization Config File
|
||||
# For bz#2117532 - [RHEL9.1] Revert patch of configuring networking by NM keyfiles
|
||||
# For bz#2098501 - [RHEL-9.1] IPv6 not workable when cloud-init configure network using NM keyfiles
|
||||
Patch16: ci-Revert-Add-native-NetworkManager-support-1224.patch
|
||||
# For bz#2107463 - [RHEL-9.1] Cannot run sysconfig when changing the priority of network renderers
|
||||
# For bz#2104389 - [RHEL-9.1]Failed to config static IP and IPv6 according to VMware Customization Config File
|
||||
# For bz#2117532 - [RHEL9.1] Revert patch of configuring networking by NM keyfiles
|
||||
# For bz#2098501 - [RHEL-9.1] IPv6 not workable when cloud-init configure network using NM keyfiles
|
||||
Patch17: ci-Revert-Use-Network-Manager-and-Netplan-as-default-re.patch
|
||||
# For bz#2107463 - [RHEL-9.1] Cannot run sysconfig when changing the priority of network renderers
|
||||
# For bz#2104389 - [RHEL-9.1]Failed to config static IP and IPv6 according to VMware Customization Config File
|
||||
# For bz#2117532 - [RHEL9.1] Revert patch of configuring networking by NM keyfiles
|
||||
# For bz#2098501 - [RHEL-9.1] IPv6 not workable when cloud-init configure network using NM keyfiles
|
||||
Patch18: ci-Revert-Revert-Setting-highest-autoconnect-priority-f.patch
|
||||
|
||||
# Source-git patches
|
||||
|
||||
|
|
@ -221,6 +236,19 @@ fi
|
|||
%config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf
|
||||
|
||||
%changelog
|
||||
* Wed Aug 17 2022 Miroslav Rezanina <mrezanin@redhat.com> - 22.1-5
|
||||
- ci-Revert-Add-native-NetworkManager-support-1224.patch [bz#2107463 bz#2104389 bz#2117532 bz#2098501]
|
||||
- ci-Revert-Use-Network-Manager-and-Netplan-as-default-re.patch [bz#2107463 bz#2104389 bz#2117532 bz#2098501]
|
||||
- ci-Revert-Revert-Setting-highest-autoconnect-priority-f.patch [bz#2107463 bz#2104389 bz#2117532 bz#2098501]
|
||||
- Resolves: bz#2107463
|
||||
([RHEL-9.1] Cannot run sysconfig when changing the priority of network renderers)
|
||||
- Resolves: bz#2104389
|
||||
([RHEL-9.1]Failed to config static IP and IPv6 according to VMware Customization Config File)
|
||||
- Resolves: bz#2117532
|
||||
([RHEL9.1] Revert patch of configuring networking by NM keyfiles)
|
||||
- Resolves: bz#2098501
|
||||
([RHEL-9.1] IPv6 not workable when cloud-init configure network using NM keyfiles)
|
||||
|
||||
* Thu Jun 23 2022 Jon Maloy <jmaloy@redhat.com> - 22.1-4
|
||||
- ci-Honor-system-locale-for-RHEL-1355.patch [bz#2061604]
|
||||
- ci-cloud-init.spec-adjust-path-for-66-azure-ephemeral.r.patch [bz#2096270]
|
||||
|
|
|
|||
Loading…
Reference in New Issue