rpms/cloud-init
6
1
Fork 1
Code Issues Pull Requests Releases Activity

Order cloud-init.service after network.service and NetworkManager.service

Browse Source 
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
This commit is contained in:
Garrett Holmstrom 2017-03-14 15:37:16 -07:00
parent 31e1cd1a40
commit 7c131a37b4
3 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cloud-init-0.7.8-before-network-target.patch Normal file
View File

@ -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]

2
cloud-init-0.7.8-before-nm.patch
View File

@ -6,7 +6,7 @@ Index: cloud-init-0.7.8/systemd/cloud-init-local.service
Wants=network-pre.target Wants=network-pre.target
After=local-fs.target After=local-fs.target
Conflicts=shutdown.target Conflicts=shutdown.target
+Before=NetworkManager.target +Before=NetworkManager.service
Before=network-pre.target Before=network-pre.target
Before=shutdown.target Before=shutdown.target

10
cloud-init.spec
View File

@ -59,6 +59,13 @@ Patch12: cloud-init-0.7.8-enable-digitalocean.patch
# https://git.launchpad.net/cloud-init/commit/?id=3705bb5964a2ff3f9a67265e6d090a112b35e40c # https://git.launchpad.net/cloud-init/commit/?id=3705bb5964a2ff3f9a67265e6d090a112b35e40c
Patch14: cloud-init-0.7.8-systemd-loop.target 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 BuildArch: noarch
BuildRequires: pkgconfig BuildRequires: pkgconfig
@ -200,6 +207,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %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 * Fri Jan 27 2017 Garrett Holmstrom <gholms@fedoraproject.org> - 0.7.8-5
- Re-applied rsyslog configuration fixes - Re-applied rsyslog configuration fixes
- Disabled GCE tests broken by python-httpretty-0.8.14-1.20161011git70af1f8 - Disabled GCE tests broken by python-httpretty-0.8.14-1.20161011git70af1f8