diff options
author | Hugo Hörnquist <hugo@lysator.liu.se> | 2022-01-03 17:22:13 +0100 |
---|---|---|
committer | Hugo Hörnquist <hugo@lysator.liu.se> | 2022-01-03 18:19:26 +0100 |
commit | 1b1fe9a8eaab802951ad9e48e2632deec9944423 (patch) | |
tree | 045a23e7db1263d69d3db15cbded0666d38b7da3 /modules/nspawn/manifests | |
parent | Network rewrites. (diff) | |
download | webdav_server-1b1fe9a8eaab802951ad9e48e2632deec9944423.tar.gz webdav_server-1b1fe9a8eaab802951ad9e48e2632deec9944423.tar.xz |
networking
Diffstat (limited to 'modules/nspawn/manifests')
-rw-r--r-- | modules/nspawn/manifests/util/enable_networkd.pp | 23 |
1 files changed, 13 insertions, 10 deletions
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' ] |