From 80b2650c9c104a482596985944bf014766981066 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Apr 28 2020 16:08:37 +0000
Subject: import cloud-init-18.5-12.el8_2.1


---

diff --git a/SOURCES/ci-Make-cloud-init.service-execute-after-network-is-up.patch b/SOURCES/ci-Make-cloud-init.service-execute-after-network-is-up.patch
new file mode 100644
index 0000000..34757c5
--- /dev/null
+++ b/SOURCES/ci-Make-cloud-init.service-execute-after-network-is-up.patch
@@ -0,0 +1,42 @@
+From 3114e706818b0eebb3c41b372a3515cf5ead275e Mon Sep 17 00:00:00 2001
+From: Eduardo Otubo <otubo@redhat.com>
+Date: Tue, 21 Apr 2020 16:58:28 +0200
+Subject: [PATCH] Make cloud-init.service execute after network is up
+
+RH-Author: Eduardo Otubo <otubo@redhat.com>
+Message-id: <20200421122128.17489-1-otubo@redhat.com>
+Patchwork-id: 96030
+O-Subject: [RHEL-8.2.0.z cloud-init PATCH] Make cloud-init.service execute after network is up
+Bugzilla: 1826262
+RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
+RH-Acked-by: Daniel P. Berrange <berrange@redhat.com>
+RH-Acked-by: Cathy Avery <cavery@redhat.com>
+
+BZ: 1826262
+BRANCH: rhel820/master-18.5
+BREW: 28038801
+
+cloud-init.service needs to wait until network is fully up before
+continuing executing and configuring its service.
+
+Signed-off-by: Eduardo Otubo <otubo@redhat.com>
+Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
+---
+ rhel/systemd/cloud-init.service | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/rhel/systemd/cloud-init.service b/rhel/systemd/cloud-init.service
+index d0023a0..0b3d796 100644
+--- a/rhel/systemd/cloud-init.service
++++ b/rhel/systemd/cloud-init.service
+@@ -5,6 +5,7 @@ Wants=sshd-keygen.service
+ Wants=sshd.service
+ After=cloud-init-local.service
+ After=NetworkManager.service network.service
++After=NetworkManager-wait-online.service
+ Before=network-online.target
+ Before=sshd-keygen.service
+ Before=sshd.service
+-- 
+1.8.3.1
+
diff --git a/SPECS/cloud-init.spec b/SPECS/cloud-init.spec
index e452c36..2bb30ac 100644
--- a/SPECS/cloud-init.spec
+++ b/SPECS/cloud-init.spec
@@ -6,7 +6,7 @@
 
 Name:           cloud-init
 Version:        18.5
-Release:        12%{?dist}
+Release:        12%{?dist}.1
 Summary:        Cloud instance init scripts
 
 Group:          System Environment/Base
@@ -57,6 +57,8 @@ Patch25: ci-net-skip-bond-interfaces-in-get_interfaces.patch
 Patch26: ci-net-add-is_master-check-for-filtering-device-list.patch
 # For bz#1807797 - [cloud-init][RHEL-8.2.0] /etc/resolv.conf lose config after reboot (initial instance is ok)
 Patch27: ci-Remove-race-condition-between-cloud-init-and-Network.patch
+# For bz#1826262 - [RHEL8.2] Race condition of starting cloud-init and NetworkManager [rhel-8.2.0.z]
+Patch28: ci-Make-cloud-init.service-execute-after-network-is-up.patch
 
 BuildArch:      noarch
 
@@ -239,6 +241,11 @@ fi
 %config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf
 
 %changelog
+* Tue Apr 21 2020 Miroslav Rezanina <mrezanin@redhat.com> - 18.5-12.el8_2.1
+- ci-Make-cloud-init.service-execute-after-network-is-up.patch [bz#1826262]
+- Resolves: bz#1826262
+  ([RHEL8.2] Race condition of starting cloud-init and NetworkManager [rhel-8.2.0.z])
+
 * Tue Mar 10 2020 Miroslav Rezanina <mrezanin@redhat.com> - 18.5-12.el8
 - ci-Remove-race-condition-between-cloud-init-and-Network.patch [bz#1807797]
 - Resolves: bz#1807797