From 4977fc7a3b8f197c1cc6002e7b00835dff2903e8c1a2b28e48b8899cb0e5e4f0 Mon Sep 17 00:00:00 2001
From: Robert Schweikert <rjschwei@suse.com>
Date: Tue, 24 Sep 2019 19:53:38 +0000
Subject: [PATCH] - Add cloud-init-after-wicked.patch   - Change the service
 order, the cloud-init service wants to run after     networking is started

OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=147
---
 cloud-init-after-wicked.patch | 13 +++++++++++++
 cloud-init.changes            |  7 +++++++
 cloud-init.spec               |  3 +++
 3 files changed, 23 insertions(+)
 create mode 100644 cloud-init-after-wicked.patch

diff --git a/cloud-init-after-wicked.patch b/cloud-init-after-wicked.patch
new file mode 100644
index 0000000..4c08a41
--- /dev/null
+++ b/cloud-init-after-wicked.patch
@@ -0,0 +1,13 @@
+Index: cloud-init-19.1/systemd/cloud-init.service.tmpl
+===================================================================
+--- cloud-init-19.1.orig/systemd/cloud-init.service.tmpl
++++ cloud-init-19.1/systemd/cloud-init.service.tmpl
+@@ -14,7 +14,7 @@ After=networking.service
+ After=network.service
+ {% endif %}
+ {% if variant in ["suse"] %}
+-Before=wicked.service
++After=wicked.service
+ # setting hostname via hostnamectl depends on dbus, which otherwise
+ # would not be guaranteed at this point.
+ After=dbus.service
diff --git a/cloud-init.changes b/cloud-init.changes
index 2e5f14e..4710502 100644
--- a/cloud-init.changes
+++ b/cloud-init.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Sep 24 19:50:33 UTC 2019 - Robert Schweikert <rjschwei@suse.com>
+
+- Add cloud-init-after-wicked.patch
+  - Change the service order, the cloud-init service wants to run after
+    networking is started
+
 -------------------------------------------------------------------
 Tue Sep 24 18:46:00 UTC 2019 - Robert Schweikert <rjschwei@suse.com>
 
diff --git a/cloud-init.spec b/cloud-init.spec
index 020121a..f4a1159 100644
--- a/cloud-init.spec
+++ b/cloud-init.spec
@@ -50,6 +50,8 @@ Patch48:        cloud-init-detect-nova.diff
 Patch49:        cloud-init-add-static-routes.diff
 # FIXME (lp#1843634)
 Patch50:        cloud-init-noresolv-merge-no-dns-data.diff
+# FIXME
+Patch51:        cloud-init-after-wicked.patch
 
 BuildRequires:  fdupes
 BuildRequires:  filesystem
@@ -196,6 +198,7 @@ Documentation and examples for cloud-init tools
 %patch48 -p1
 %patch49 -p1
 %patch50 -p1
+%patch51 -p1
 
 %build
 %if 0%{?suse_version} && 0%{?suse_version} <= 1315