aboutsummaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorEmil Renner Berthing <esmil@labitat.dk>2017-11-20 21:06:47 +0100
committerEmil Renner Berthing <esmil@labitat.dk>2017-11-20 21:06:55 +0100
commit1b1d931fe4656cccbcf621913ce3b09a0d89280a (patch)
tree27e4523b8ced413606aae83916b2c02dcad17b67 /roles
parentfbdea6d790ced4075195cdd663ac420a7dc5857b (diff)
downloadlabitat-ansible-1b1d931fe4656cccbcf621913ce3b09a0d89280a.tar.gz
labitat-ansible-1b1d931fe4656cccbcf621913ce3b09a0d89280a.tar.xz
labitat-ansible-1b1d931fe4656cccbcf621913ce3b09a0d89280a.zip
space_server: networkd: use drop-in file for wait-online
The trick to overwriting the ExecStart option is to clear it first with ExecStart=
Diffstat (limited to 'roles')
-rw-r--r--roles/space_server/files/networkd/no-lan-mgt.conf3
-rw-r--r--roles/space_server/files/networkd/systemd-networkd-wait-online.service23
-rw-r--r--roles/space_server/tasks/networkd.yml10
3 files changed, 9 insertions, 27 deletions
diff --git a/roles/space_server/files/networkd/no-lan-mgt.conf b/roles/space_server/files/networkd/no-lan-mgt.conf
new file mode 100644
index 0000000..3309cf0
--- /dev/null
+++ b/roles/space_server/files/networkd/no-lan-mgt.conf
@@ -0,0 +1,3 @@
+[Service]
+ExecStart=
+ExecStart=/usr/lib/systemd/systemd-networkd-wait-online --ignore lan --ignore mgt
diff --git a/roles/space_server/files/networkd/systemd-networkd-wait-online.service b/roles/space_server/files/networkd/systemd-networkd-wait-online.service
deleted file mode 100644
index 0f1e85a..0000000
--- a/roles/space_server/files/networkd/systemd-networkd-wait-online.service
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file is part of systemd.
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-
-[Unit]
-Description=Wait for Network to be Configured
-Documentation=man:systemd-networkd-wait-online.service(8)
-DefaultDependencies=no
-Conflicts=shutdown.target
-Requisite=systemd-networkd.service
-After=systemd-networkd.service
-Before=network-online.target
-
-[Service]
-Type=oneshot
-ExecStart=/usr/lib/systemd/systemd-networkd-wait-online --ignore lan --ignore mgt
-RemainAfterExit=yes
-
-[Install]
-WantedBy=network-online.target
diff --git a/roles/space_server/tasks/networkd.yml b/roles/space_server/tasks/networkd.yml
index ef97844..ecd5d52 100644
--- a/roles/space_server/tasks/networkd.yml
+++ b/roles/space_server/tasks/networkd.yml
@@ -25,12 +25,14 @@
notify:
- restart networkd
-# Unfortunately a drop-in file doesn't seem to work,
-# so overwrite the whole service file :/
+- name: Create systemd-networkd-wait-online drop-in directory
+ file:
+ dest: '/etc/systemd/system/systemd-networkd-wait-online.service.d'
+ state: directory
- name: Don't wait for lan and mgt interfaces to come online
copy:
- src: networkd/systemd-networkd-wait-online.service
- dest: '/etc/systemd/system/systemd-networkd-wait-online.service'
+ src: networkd/no-lan-mgt.conf
+ dest: '/etc/systemd/system/systemd-networkd-wait-online.service.d/no-lan-mgt.conf'
- name: Enable systemd-networkd
systemd: