Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Nest
Puppet
Commits
8030be76
Commit
8030be76
authored
May 03, 2019
by
James T. Lee
Browse files
Fix failing resources under systemd-nspawn
parent
d1aead5f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
13 deletions
+17
-13
manifests/profile/base/systemd.pp
manifests/profile/base/systemd.pp
+5
-3
manifests/profile/base/zfs.pp
manifests/profile/base/zfs.pp
+12
-10
No files found.
manifests/profile/base/systemd.pp
View file @
8030be76
...
@@ -55,9 +55,11 @@ class nest::profile::base::systemd {
...
@@ -55,9 +55,11 @@ class nest::profile::base::systemd {
changes
=>
flatten
(
$nsswitch_id_changes
+
$nsswitch_hosts_changes
),
changes
=>
flatten
(
$nsswitch_id_changes
+
$nsswitch_hosts_changes
),
}
}
file
{
'/etc/resolv.conf'
:
unless
$facts
[
'virtual'
]
==
'lxc'
{
ensure
=>
link
,
file
{
'/etc/resolv.conf'
:
target
=>
'/run/systemd/resolve/stub-resolv.conf'
,
ensure
=>
link
,
target
=>
'/run/systemd/resolve/stub-resolv.conf'
,
}
}
}
file
{
file
{
...
...
manifests/profile/base/zfs.pp
View file @
8030be76
...
@@ -23,17 +23,19 @@ class nest::profile::base::zfs {
...
@@ -23,17 +23,19 @@ class nest::profile::base::zfs {
require
=>
Package
[
'sys-fs/zfs'
],
require
=>
Package
[
'sys-fs/zfs'
],
}
}
# ZFS likes to have a little extra headroom on low memory systems
unless
$facts
[
'virtual'
]
==
'lxc'
{
sysctl
{
'vm.min_free_kbytes'
:
# ZFS likes to have a little extra headroom on low memory systems
value
=>
'32768'
,
sysctl
{
'vm.min_free_kbytes'
:
target
=>
'/etc/sysctl.d/nest.conf'
,
value
=>
'32768'
,
}
target
=>
'/etc/sysctl.d/nest.conf'
,
}
# Not strictly ZFS related, though our swap is on ZFS, but this
# Not strictly ZFS related, though our swap is on ZFS, but this
# seems to improve stability in low memory conditions, counterintuitively.
# seems to improve stability in low memory conditions, counterintuitively.
sysctl
{
'vm.swappiness'
:
sysctl
{
'vm.swappiness'
:
value
=>
'10'
,
value
=>
'10'
,
target
=>
'/etc/sysctl.d/nest.conf'
,
target
=>
'/etc/sysctl.d/nest.conf'
,
}
}
}
group
{
'zfssnap'
:
group
{
'zfssnap'
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment