forked from pool/cloud-init
26 lines
888 B
Diff
26 lines
888 B
Diff
|
commit d3ebe74b29001a7e217431cc2f09412693e33341
|
||
|
|
Author: Bernhard M. Wiedemann <bwiedemann@suse.de>
|
||
|
|
Date: Thu Jun 28 15:38:41 2018 +0200
|
||
|
|
|
||
|
|
Run metadata detection after network-online (boo#1097388)
|
||
|
|
|
||
|
|
otherwise it will only have DataSourceNone in an OpenStack cloud
|
||
|
|
cloud-init-network-online.patch
|
||
|
|
|
||
|
|
https://bugzilla.opensuse.org/show_bug.cgi?id=1097388
|
||
|
|
https://bugs.launchpad.net/cloud-init/+bug/1779139
|
||
|
|
|
||
|
|
diff --git a/systemd/cloud-init.service.tmpl b/systemd/cloud-init.service.tmpl
|
||
|
|
index b92e8abc..5bfa57f6 100644
|
||
|
|
--- a/systemd/cloud-init.service.tmpl
|
||
|
|
+++ b/systemd/cloud-init.service.tmpl
|
||
|
|
@@ -20,7 +20,7 @@ After=wicked.service
|
||
|
|
# would not be guaranteed at this point.
|
||
|
|
After=dbus.service
|
||
|
|
{% endif %}
|
||
|
|
-Before=network-online.target
|
||
|
|
+After=network-online.target
|
||
|
|
Before=sshd-keygen.service
|
||
|
|
Before=sshd.service
|
||
|
|
{% if variant in ["ubuntu", "unknown", "debian"] %}
|