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
ae3abaea
Commit
ae3abaea
authored
May 03, 2019
by
James T. Lee
Browse files
Revert "Fix failing resources under systemd-nspawn"
This reverts commit
8030be76
.
parent
8030be76
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
17 deletions
+13
-17
manifests/profile/base/systemd.pp
manifests/profile/base/systemd.pp
+3
-5
manifests/profile/base/zfs.pp
manifests/profile/base/zfs.pp
+10
-12
No files found.
manifests/profile/base/systemd.pp
View file @
ae3abaea
...
@@ -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
{
...
...
manifests/profile/base/zfs.pp
View file @
ae3abaea
...
@@ -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'
:
...
...
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