From 1b1fe9a8eaab802951ad9e48e2632deec9944423 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Mon, 3 Jan 2022 17:22:13 +0100
Subject: networking

---
 modules/nspawn/manifests/util/enable_networkd.pp | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'modules/nspawn')

diff --git a/modules/nspawn/manifests/util/enable_networkd.pp b/modules/nspawn/manifests/util/enable_networkd.pp
index 2b532b9..8e447b9 100644
--- a/modules/nspawn/manifests/util/enable_networkd.pp
+++ b/modules/nspawn/manifests/util/enable_networkd.pp
@@ -4,19 +4,22 @@ define nspawn::util::enable_networkd (
 ) {
 
   # TODO only do this if the directory is empty
-  networking::networkd { "Initial networking on ${machine}":
-    filename => '20-puppet-initial',
-    match  => { 'Name' => 'host0', },
-    root   => $machine_path,
-    network => {
-      'DHCP'         => 'ipv4',
-      'IPv6AcceptRA' => 1,
+  networking::networkd_instance { "Initial networking on ${machine}":
+    priority => 50,
+    filename => 'puppet-initial',
+    path     => "${machine_path}/${networking::networkd::path}",
+    content  => {
+      'Match'   => {
+        'Name' => 'host0',
+      },
+      'Network' => {
+        'DHCP'         => 'ipv4',
+        'IPv6AcceptRA' => 1,
+      },
     },
-    notify_          => false,
-    manage_directory => false,
   }
 
-  $running = $facts['machined-info'][$machine] != Undef or $facts['machined-info'][$machine]['State'] == 'running' 
+  $running = $facts['machined-info'][$machine] != Undef or $facts['machined-info'][$machine]['State'] == 'running'
 
   $cmd = if $running {
     [ 'systemctl', '-M', $machine, 'enable', 'systemd-networkd' ]
-- 
cgit v1.2.3