From 301b9c551582b614dfc5e54a5e93fbbf0a29dda4 Mon Sep 17 00:00:00 2001
From: Garrett Holmstrom <gholms@devzero.com>
Date: Tue, 14 Mar 2017 15:16:37 -0700
Subject: [PATCH] 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
---
 cloud-init-0.7.9-before-network-target.patch | 14 ++++++++++++++
 cloud-init.spec                              |  8 ++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 cloud-init-0.7.9-before-network-target.patch

diff --git a/cloud-init-0.7.9-before-network-target.patch b/cloud-init-0.7.9-before-network-target.patch
new file mode 100644
index 0000000..e7a3760
--- /dev/null
+++ b/cloud-init-0.7.9-before-network-target.patch
@@ -0,0 +1,14 @@
+Index: cloud-init-0.7.9/systemd/cloud-init.service
+===================================================================
+--- cloud-init-0.7.9.orig/systemd/cloud-init.service
++++ cloud-init-0.7.9/systemd/cloud-init.service
+@@ -4,7 +4,8 @@ Wants=cloud-init-local.service
+ Wants=sshd-keygen.service
+ Wants=sshd.service
+ After=cloud-init-local.service
+-After=networking.service
++After=network.service
++After=NetworkManager.service
+ Before=network-online.target
+ Before=sshd-keygen.service
+ Before=sshd.service
diff --git a/cloud-init.spec b/cloud-init.spec
index c447e10..0e6d1b1 100644
--- a/cloud-init.spec
+++ b/cloud-init.spec
@@ -66,6 +66,13 @@ Patch16:        cloud-init-0.7.9-gt3-nameservers.patch
 # https://git.launchpad.net/cloud-init/commit/?id=1d751a6f46f044e3c3827f3cef0e4a2e71d50fe7
 Patch17:        cloud-init-0.7.9-ipv6-gateway.patch
 
+# 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
+Patch18:        cloud-init-0.7.9-before-network-target.patch
+
 BuildArch:      noarch
 
 BuildRequires:  pkgconfig(systemd)
@@ -208,6 +215,7 @@ nosetests-%{python3_version} tests/unittests/ \
 - Fixed errors in network sysconfig handling [RH:1389530, LP:1665441]
 - Made > 3 name servers a warning, not a fatal error, unbreaking IPv6 setups [LP:1670052]
 - Fixed IPv6 gateways in network sysconfig [LP:1669504]
+- Ordered cloud-init.service after network.service and NetworkManager.service [RH:1400249]
 
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.9-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild