Commit 8030be76 authored by James T. Lee's avatar James T. Lee
Browse files

Fix failing resources under systemd-nspawn

parent d1aead5f
...@@ -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 {
......
...@@ -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':
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment