summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHugo Hörnquist <hugo@lysator.liu.se>2022-01-19 14:30:58 +0100
committerHugo Hörnquist <hugo@lysator.liu.se>2022-01-19 14:30:58 +0100
commitde62a0dfe9bcdab486a17d3e63964e4a97165125 (patch)
treedf529046dc997bdaf9530661457e4d40b24ace7f
parentFix nspawn continious exec:s. (diff)
downloadnspawn-de62a0dfe9bcdab486a17d3e63964e4a97165125.tar.gz
nspawn-de62a0dfe9bcdab486a17d3e63964e4a97165125.tar.xz
Nspawn add dependency on network-online.
-rw-r--r--manifests/template_final.pp14
1 files changed, 14 insertions, 0 deletions
diff --git a/manifests/template_final.pp b/manifests/template_final.pp
index a198775..4ab5a9d 100644
--- a/manifests/template_final.pp
+++ b/manifests/template_final.pp
@@ -12,6 +12,20 @@ define nspawn::template_final (
creates => "${root}/etc/systemd/system/multi-user.target.wants/puppet.service",
}
+ file { "${root}/etc/systemd/system/puppet.service.requires":
+ ensure => directory,
+ }
+
+ # This is nice in theory, but has the problem that
+ # network-online.target is reached on our first IP-address, which
+ # will probably be our static IPv4 address, and busting.adrift.space
+ # isn't resolvable over IPv4...
+ file { "${root}/etc/systemd/system/puppet.service.requires/network-online.target":
+ ensure => link,
+ # Debian requires /lib, arch accepts it
+ target => '/lib/systemd/system/network-online.target'
+ }
+
file { [ "${root}/etc/puppetlabs",
"${root}/etc/puppetlabs/puppet" ] :
ensure => directory,