997aac067b
- ci-Add-native-NetworkManager-support-1224.patch [bz#2056964] - ci-Use-Network-Manager-and-Netplan-as-default-renderers.patch [bz#2056964] - ci-Revert-Setting-highest-autoconnect-priority-for-netw.patch [bz#2056964] - ci-Align-rhel-custom-files-with-upstream-1431.patch [bz#2088448] - ci-Remove-rhel-specific-files.patch [bz#2088448] - Resolves: bz#2056964 ([RHEL-9]Rebase cloud-init from Fedora so it can configure networking using NM keyfiles) - Resolves: bz#2088448 (Align cloud.cfg file and systemd with cloud-init upstream .tmpl files)
38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
From e5e2ba9e21ac40ec7b8fe1c1dcf501eaeb9f66bf Mon Sep 17 00:00:00 2001
|
|
From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
|
Date: Mon, 2 May 2022 14:43:17 +0200
|
|
Subject: [PATCH 3/5] Revert "Setting highest autoconnect priority for
|
|
network-scripts"
|
|
|
|
RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
|
RH-MergeRequest: 24: Add native NetworkManager support (#1224)
|
|
RH-Commit: [3/3] 06c87581fc42b6827ad9df600f3dd76d51ced0d0 (eesposit/cloud-init-centos-)
|
|
RH-Bugzilla: 2056964
|
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
|
|
|
This reverts commit 0ef0c86350aa5f800f8393a432f431e2818c8938,
|
|
since it was a temporary downstream-only patch while we waited for
|
|
"Add native NetworkManager support (#1224)".
|
|
|
|
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
|
---
|
|
cloudinit/net/sysconfig.py | 1 -
|
|
1 file changed, 1 deletion(-)
|
|
|
|
diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
|
|
index 2a45a4fa..dc401d78 100644
|
|
--- a/cloudinit/net/sysconfig.py
|
|
+++ b/cloudinit/net/sysconfig.py
|
|
@@ -317,7 +317,6 @@ class Renderer(renderer.Renderer):
|
|
"ONBOOT": True,
|
|
"USERCTL": False,
|
|
"BOOTPROTO": "none",
|
|
- "AUTOCONNECT_PRIORITY": 999
|
|
},
|
|
"suse": {"BOOTPROTO": "static", "STARTMODE": "auto"},
|
|
}
|
|
--
|
|
2.31.1
|
|
|