* Wed Dec 21 2022 Camilla Conte <cconte@redhat.com> - 22.1-7
- ci-Ensure-network-ready-before-cloud-init-service-runs-.patch [bz#2152100] - Resolves: bz#2152100 ([RHEL-9] Ensure network ready before cloud-init service runs on RHEL)
This commit is contained in:
parent
da89d12056
commit
2477af0c09
@ -0,0 +1,36 @@
|
|||||||
|
From 14d1952c17637b80923d1bfaf3b6b5f8cf032147 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||||||
|
Date: Wed, 14 Dec 2022 09:31:51 +0100
|
||||||
|
Subject: [PATCH] Ensure network ready before cloud-init service runs on RHEL
|
||||||
|
(#1893)
|
||||||
|
|
||||||
|
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2152100
|
||||||
|
|
||||||
|
commit 6e725f36647407d201af0603d7db11fc96a93d4d
|
||||||
|
Author: James Falcon <james.falcon@canonical.com>
|
||||||
|
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 <eesposit@redhat.com>
|
||||||
|
---
|
||||||
|
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
|
||||||
|
|
@ -1,6 +1,6 @@
|
|||||||
Name: cloud-init
|
Name: cloud-init
|
||||||
Version: 22.1
|
Version: 22.1
|
||||||
Release: 6%{?dist}
|
Release: 7%{?dist}
|
||||||
Summary: Cloud instance init scripts
|
Summary: Cloud instance init scripts
|
||||||
License: ASL 2.0 or GPLv3
|
License: ASL 2.0 or GPLv3
|
||||||
URL: http://launchpad.net/cloud-init
|
URL: http://launchpad.net/cloud-init
|
||||||
@ -48,6 +48,8 @@ Patch17: ci-Revert-Use-Network-Manager-and-Netplan-as-default-re.patch
|
|||||||
Patch18: ci-Revert-Revert-Setting-highest-autoconnect-priority-f.patch
|
Patch18: ci-Revert-Revert-Setting-highest-autoconnect-priority-f.patch
|
||||||
# For bz#2115565 - cloud-init configures user "centos" or "rhel" instead of "cloud-user" with cloud-init-22.1
|
# For bz#2115565 - cloud-init configures user "centos" or "rhel" instead of "cloud-user" with cloud-init-22.1
|
||||||
Patch19: ci-cloud.cfg.tmpl-make-sure-centos-settings-are-identic.patch
|
Patch19: ci-cloud.cfg.tmpl-make-sure-centos-settings-are-identic.patch
|
||||||
|
# For bz#2152100 - [RHEL-9] Ensure network ready before cloud-init service runs on RHEL
|
||||||
|
Patch20: ci-Ensure-network-ready-before-cloud-init-service-runs-.patch
|
||||||
|
|
||||||
# Source-git patches
|
# Source-git patches
|
||||||
|
|
||||||
@ -238,6 +240,11 @@ fi
|
|||||||
%config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf
|
%config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Dec 21 2022 Camilla Conte <cconte@redhat.com> - 22.1-7
|
||||||
|
- ci-Ensure-network-ready-before-cloud-init-service-runs-.patch [bz#2152100]
|
||||||
|
- Resolves: bz#2152100
|
||||||
|
([RHEL-9] Ensure network ready before cloud-init service runs on RHEL)
|
||||||
|
|
||||||
* Tue Sep 27 2022 Camilla Conte <cconte@redhat.com> - 22.1-6
|
* Tue Sep 27 2022 Camilla Conte <cconte@redhat.com> - 22.1-6
|
||||||
- ci-cloud.cfg.tmpl-make-sure-centos-settings-are-identic.patch [bz#2115565]
|
- ci-cloud.cfg.tmpl-make-sure-centos-settings-are-identic.patch [bz#2115565]
|
||||||
- Resolves: bz#2115565
|
- Resolves: bz#2115565
|
||||||
|
Loading…
Reference in New Issue
Block a user