aboutsummaryrefslogtreecommitdiffstats
path: root/roles/space_server
diff options
context:
space:
mode:
authorEmil Renner Berthing <esmil@labitat.dk>2018-11-30 18:40:13 +0100
committerEmil Renner Berthing <esmil@labitat.dk>2018-11-30 18:40:16 +0100
commit380377e55a9373c8203e62d184107e1c5bbe1da0 (patch)
treeaadc30305b27dc963e2599076e7b825bc360952d /roles/space_server
parent4c8ce84da087dde7ace19704f084738fbd44f0a0 (diff)
downloadlabitat-ansible-380377e55a9373c8203e62d184107e1c5bbe1da0.tar.gz
labitat-ansible-380377e55a9373c8203e62d184107e1c5bbe1da0.tar.xz
labitat-ansible-380377e55a9373c8203e62d184107e1c5bbe1da0.zip
space_server: networkd: use Link.RequiredForOnline
..rather than overriding ExecStart to call networkd-wait-online with --ignore
Diffstat (limited to 'roles/space_server')
-rw-r--r--roles/space_server/files/networkd-no-lan-mgt.conf3
-rw-r--r--roles/space_server/files/networkd/10-lan.network3
-rw-r--r--roles/space_server/files/networkd/10-mgt.network3
-rw-r--r--roles/space_server/tasks/networkd.yml15
4 files changed, 5 insertions, 19 deletions
diff --git a/roles/space_server/files/networkd-no-lan-mgt.conf b/roles/space_server/files/networkd-no-lan-mgt.conf
deleted file mode 100644
index 3309cf0..0000000
--- a/roles/space_server/files/networkd-no-lan-mgt.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[Service]
-ExecStart=
-ExecStart=/usr/lib/systemd/systemd-networkd-wait-online --ignore lan --ignore mgt
diff --git a/roles/space_server/files/networkd/10-lan.network b/roles/space_server/files/networkd/10-lan.network
index 08b85aa..1b2e89c 100644
--- a/roles/space_server/files/networkd/10-lan.network
+++ b/roles/space_server/files/networkd/10-lan.network
@@ -1,8 +1,9 @@
[Match]
Name=lan
-#[Link]
+[Link]
#ARP=no
+RequiredForOnline=no
[Network]
DHCP=no
diff --git a/roles/space_server/files/networkd/10-mgt.network b/roles/space_server/files/networkd/10-mgt.network
index 9da626e..9ca1fae 100644
--- a/roles/space_server/files/networkd/10-mgt.network
+++ b/roles/space_server/files/networkd/10-mgt.network
@@ -1,6 +1,9 @@
[Match]
Name=mgt
+[Link]
+RequiredForOnline=no
+
[Network]
DHCP=no
IPv6AcceptRA=no
diff --git a/roles/space_server/tasks/networkd.yml b/roles/space_server/tasks/networkd.yml
index 364d9cb..deada30 100644
--- a/roles/space_server/tasks/networkd.yml
+++ b/roles/space_server/tasks/networkd.yml
@@ -28,19 +28,4 @@
state: absent
with_items: "{{ networkd_existing.files|map(attribute='path')|difference(networkd_created.results|map(attribute='dest'))|list }}"
-- name: Create systemd-networkd-wait-online drop-in directory
- file:
- dest: '/etc/systemd/system/systemd-networkd-wait-online.service.d'
- state: directory
- owner: root
- group: root
- mode: 0755
-- name: Don't wait for lan and mgt interfaces to come online
- copy:
- dest: '/etc/systemd/system/systemd-networkd-wait-online.service.d/no-lan-mgt.conf'
- src: networkd-no-lan-mgt.conf
- owner: root
- group: root
- mode: 0644
-
# vim: set ts=2 sw=2 et: