diff --git a/ci-Ensure-network-ready-before-cloud-init-service-runs-.patch b/ci-Ensure-network-ready-before-cloud-init-service-runs-.patch new file mode 100644 index 0000000..cc65e3e --- /dev/null +++ b/ci-Ensure-network-ready-before-cloud-init-service-runs-.patch @@ -0,0 +1,43 @@ +From df1c0f391537071c34652ee6df9bff87e5aea230 Mon Sep 17 00:00:00 2001 +From: Emanuele Giuseppe Esposito +Date: Wed, 14 Dec 2022 09:20:47 +0100 +Subject: [PATCH] Ensure network ready before cloud-init service runs on RHEL + (#1893) + +RH-Author: Emanuele Giuseppe Esposito +RH-MergeRequest: 87: Ensure network ready before cloud-init service runs on RHEL (#1893) +RH-Bugzilla: 2151861 +RH-Acked-by: Mohamed Gamal Morsy +RH-Acked-by: Camilla Conte +RH-Commit: [1/1] 5bb5f6f94a205854633fb1606ccc68e838c2030d + +Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2151861 + +commit 6e725f36647407d201af0603d7db11fc96a93d4d +Author: James Falcon +Date: Tue Dec 13 10:55:23 2022 -0600 + + Ensure network ready before cloud-init service runs on RHEL (#1893) + + LP: #1998655 + +Signed-off-by: Emanuele Giuseppe Esposito +--- + systemd/cloud-init.service.tmpl | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/systemd/cloud-init.service.tmpl b/systemd/cloud-init.service.tmpl +index c170aef7..fc984d5c 100644 +--- a/systemd/cloud-init.service.tmpl ++++ b/systemd/cloud-init.service.tmpl +@@ -16,6 +16,7 @@ After=networking.service + "miraclelinux", "openEuler", "rhel", "rocky", "virtuozzo"] %} + After=network.service + After=NetworkManager.service ++After=NetworkManager-wait-online.service + {% endif %} + {% if variant in ["suse"] %} + After=wicked.service +-- +2.38.1 + diff --git a/cloud-init.spec b/cloud-init.spec index 8965567..e3740c8 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -6,7 +6,7 @@ Name: cloud-init Version: 22.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Cloud instance init scripts Group: System Environment/Base @@ -47,6 +47,8 @@ Patch13: ci-Revert-Add-native-NetworkManager-support-1224.patch Patch14: ci-Revert-Use-Network-Manager-and-Netplan-as-default-re.patch # For bz#2115576 - cloud-init configures user "centos" or "rhel" instead of "cloud-user" with cloud-init-22.1 Patch15: ci-cloud.cfg.tmpl-make-sure-centos-settings-are-identic.patch +# For bz#2151861 - [RHEL-8] Ensure network ready before cloud-init service runs on RHEL +Patch16: ci-Ensure-network-ready-before-cloud-init-service-runs-.patch BuildArch: noarch @@ -232,6 +234,11 @@ fi %config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf %changelog +* Wed Dec 28 2022 Camilla Conte - 22.1-7 +- ci-Ensure-network-ready-before-cloud-init-service-runs-.patch [bz#2151861] +- Resolves: bz#2151861 + ([RHEL-8] Ensure network ready before cloud-init service runs on RHEL) + * Mon Oct 17 2022 Jon Maloy - 22.1-6 - ci-cloud.cfg.tmpl-make-sure-centos-settings-are-identic.patch [bz#2115576] - Resolves: bz#2115576