From 7c131a37b46c97b572a387300bed5f6567cd0022 Mon Sep 17 00:00:00 2001
From: Garrett Holmstrom <gholms@devzero.com>
Date: Mar 14 2017 22:55:18 +0000
Subject: Order cloud-init.service after network.service and NetworkManager.service


cloud-init.service is meant to run when networking is up, but before
network-online.target unleashes other services in case people want to
set up networking customizations that run before those services do.

https://bugzilla.redhat.com/show_bug.cgi?id=1400249

---

diff --git a/cloud-init-0.7.8-before-network-target.patch b/cloud-init-0.7.8-before-network-target.patch
new file mode 100644
index 0000000..6485fed
--- /dev/null
+++ b/cloud-init-0.7.8-before-network-target.patch
@@ -0,0 +1,14 @@
+Index: cloud-init-0.7.8/systemd/cloud-init.service
+===================================================================
+--- cloud-init-0.7.8.orig/systemd/cloud-init.service
++++ cloud-init-0.7.8/systemd/cloud-init.service
+@@ -1,8 +1,7 @@
+ [Unit]
+ Description=Initial cloud-init job (metadata service crawler)
+-After=cloud-init-local.service networking.service
++After=cloud-init-local.service network.service NetworkManager.service
+ Before=network-online.target sshd.service sshd-keygen.service systemd-user-sessions.service
+-Requires=networking.service
+ Wants=local-fs.target cloud-init-local.service sshd.service sshd-keygen.service
+ 
+ [Service]
diff --git a/cloud-init-0.7.8-before-nm.patch b/cloud-init-0.7.8-before-nm.patch
index 0bf3374..ba158a4 100644
--- a/cloud-init-0.7.8-before-nm.patch
+++ b/cloud-init-0.7.8-before-nm.patch
@@ -6,7 +6,7 @@ Index: cloud-init-0.7.8/systemd/cloud-init-local.service
  Wants=network-pre.target
  After=local-fs.target
  Conflicts=shutdown.target
-+Before=NetworkManager.target
++Before=NetworkManager.service
  Before=network-pre.target
  Before=shutdown.target
  
diff --git a/cloud-init.spec b/cloud-init.spec
index e073f60..b87546b 100644
--- a/cloud-init.spec
+++ b/cloud-init.spec
@@ -59,6 +59,13 @@ Patch12:        cloud-init-0.7.8-enable-digitalocean.patch
 # https://git.launchpad.net/cloud-init/commit/?id=3705bb5964a2ff3f9a67265e6d090a112b35e40c
 Patch14:        cloud-init-0.7.8-systemd-loop.target
 
+# Order cloud-init.service after network.service and NetworkManager.service
+# cloud-init.service is meant to run when networking is up, but before
+# network-online.target unleashes other services in case people want to
+# set up networking customizations that run before those services do.
+# https://bugzilla.redhat.com/show_bug.cgi?id=1400249
+Patch15:        cloud-init-0.7.8-before-network-target.patch
+
 BuildArch:      noarch
 
 BuildRequires:  pkgconfig
@@ -200,6 +207,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Mar 14 2017 Garrett Holmstrom <gholms@fedoraproject.org> - 0.7.8-5
+- Ordered cloud-init.service after network.service and NetworkManager.service [RH:1400249]
+
 * Fri Jan 27 2017 Garrett Holmstrom <gholms@fedoraproject.org> - 0.7.8-5
 - Re-applied rsyslog configuration fixes
 - Disabled GCE tests broken by python-httpretty-0.8.14-1.20161011git70af1f8