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

Revert "Fix failing resources under systemd-nspawn"

This reverts commit 8030be76.
parent 8030be76
...@@ -55,11 +55,9 @@ class nest::profile::base::systemd { ...@@ -55,11 +55,9 @@ class nest::profile::base::systemd {
changes => flatten($nsswitch_id_changes + $nsswitch_hosts_changes), changes => flatten($nsswitch_id_changes + $nsswitch_hosts_changes),
} }
unless $facts['virtual'] == 'lxc' { file { '/etc/resolv.conf':
file { '/etc/resolv.conf': ensure => link,
ensure => link, target => '/run/systemd/resolve/stub-resolv.conf',
target => '/run/systemd/resolve/stub-resolv.conf',
}
} }
file { file {
......
...@@ -23,19 +23,17 @@ class nest::profile::base::zfs { ...@@ -23,19 +23,17 @@ class nest::profile::base::zfs {
require => Package['sys-fs/zfs'], require => Package['sys-fs/zfs'],
} }
unless $facts['virtual'] == 'lxc' { # ZFS likes to have a little extra headroom on low memory systems
# ZFS likes to have a little extra headroom on low memory systems sysctl { 'vm.min_free_kbytes':
sysctl { 'vm.min_free_kbytes': value => '32768',
value => '32768', target => '/etc/sysctl.d/nest.conf',
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