← Back to team overview

cloud-init-dev team mailing list archive

[Merge] ~raharper/cloud-init:fix/centos-wait-network-manager into cloud-init:master

 

Ryan Harper has proposed merging ~raharper/cloud-init:fix/centos-wait-network-manager into cloud-init:master.

Commit message:
cloud-init.service: on centos/fedora/redhat wait on NetworkManager.service
    
In Centos/RHEL 8, NetworkManager is installed as the networking service.
cloud-init.service needs to run After this service to allow the OS to
bring networking up first.
    
LP: #1843334

Requested reviews:
  cloud-init Commiters (cloud-init-dev)
Related bugs:
  Bug #1843334 in cloud-init: "Change location of DHCP leases in CloudStack provider as it doesn't work for RHEL8"
  https://bugs.launchpad.net/cloud-init/+bug/1843334

For more details, see:
https://code.launchpad.net/~raharper/cloud-init/+git/cloud-init/+merge/372624
-- 
Your team cloud-init Commiters is requested to review the proposed merge of ~raharper/cloud-init:fix/centos-wait-network-manager into cloud-init:master.
diff --git a/systemd/cloud-init.service.tmpl b/systemd/cloud-init.service.tmpl
index 5cb0037..b08da1c 100644
--- a/systemd/cloud-init.service.tmpl
+++ b/systemd/cloud-init.service.tmpl
@@ -12,6 +12,7 @@ After=networking.service
 {% endif %}
 {% if variant in ["centos", "fedora", "redhat"] %}
 After=network.service
+After=NetworkManager.service
 {% endif %}
 {% if variant in ["suse"] %}
 Before=wicked.service