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
135fdcac
Commit
135fdcac
authored
Dec 17, 2020
by
James T. Lee
Browse files
facts['virtual'] -> is_container
Facter doesn't recognize buildah containers.
parent
43dcc621
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
26 additions
and
36 deletions
+26
-36
manifests/base/bootloader/systemd.pp
manifests/base/bootloader/systemd.pp
+1
-1
manifests/base/containers.pp
manifests/base/containers.pp
+5
-17
manifests/base/portage.pp
manifests/base/portage.pp
+1
-1
manifests/base/users.pp
manifests/base/users.pp
+1
-1
manifests/base/zfs.pp
manifests/base/zfs.pp
+1
-1
manifests/lib/srv.pp
manifests/lib/srv.pp
+15
-11
manifests/lib/systemd_reload.pp
manifests/lib/systemd_reload.pp
+1
-3
site.pp
site.pp
+1
-1
No files found.
manifests/base/bootloader/systemd.pp
View file @
135fdcac
class
nest::base::bootloader::systemd
{
class
nest::base::bootloader::systemd
{
if
$
facts
[
'virtual'
]
==
'lxc'
or
$facts
[
'os'
][
'architecture'
]
=~
/^
(
arm|aarch64
)
/
{
if
$
::is_container
or
$facts
[
'os'
][
'architecture'
]
=~
/^
(
arm|aarch64
)
/
{
$bootctl_args
=
'--no-variables'
$bootctl_args
=
'--no-variables'
}
else
{
}
else
{
$bootctl_args
=
''
$bootctl_args
=
''
...
...
manifests/base/containers.pp
View file @
135fdcac
class
nest::base::containers
{
class
nest::base::containers
{
service
{
'docker'
:
unless
$::is_container
{
ensure
=>
stopped
,
zfs
{
'containers'
:
enable
=>
false
,
name
=>
"
$
{facts['rpool']}/containers"
,
}
mountpoint
=>
'/var/lib/containers'
,
->
}
package
{
'app-emulation/docker'
:
ensure
=>
absent
,
}
->
file
{
'/usr/bin/docker'
:
ensure
=>
absent
,
}
zfs
{
'containers'
:
name
=>
"
$
{facts['rpool']}/containers"
,
mountpoint
=>
'/var/lib/containers'
,
}
}
package
{
[
package
{
[
...
...
manifests/base/portage.pp
View file @
135fdcac
...
@@ -70,7 +70,7 @@ class nest::base::portage {
...
@@ -70,7 +70,7 @@ class nest::base::portage {
}
}
if
$facts
[
'os'
][
'architecture'
]
=~
/^
(
arm|aarch64
)
/
{
if
$facts
[
'os'
][
'architecture'
]
=~
/^
(
arm|aarch64
)
/
{
if
$
facts
[
'virtual'
]
==
'lxc'
{
if
$
::is_container
{
$sandbox_features
=
[
'-sandbox'
,
'-usersandbox'
,
'-pid-sandbox'
,
'-network-sandbox'
]
$sandbox_features
=
[
'-sandbox'
,
'-usersandbox'
,
'-pid-sandbox'
,
'-network-sandbox'
]
}
else
{
}
else
{
$sandbox_features
=
[]
$sandbox_features
=
[]
...
...
manifests/base/users.pp
View file @
135fdcac
...
@@ -142,7 +142,7 @@ class nest::base::users {
...
@@ -142,7 +142,7 @@ class nest::base::users {
group
=>
'users'
;
group
=>
'users'
;
}
}
if
$
facts
[
'virtual'
]
==
'lxc'
{
if
$
::is_container
{
$user_homes
=
{}
$user_homes
=
{}
}
else
{
}
else
{
$user_homes
=
{
'james'
=>
'/home/james'
}
$user_homes
=
{
'james'
=>
'/home/james'
}
...
...
manifests/base/zfs.pp
View file @
135fdcac
...
@@ -113,7 +113,7 @@ class nest::base::zfs {
...
@@ -113,7 +113,7 @@ class nest::base::zfs {
::
nest::lib::systemd_reload
{
'zfs'
:
}
::
nest::lib::systemd_reload
{
'zfs'
:
}
unless
$
facts
[
'virtual'
]
==
'lxc'
{
unless
$
::is_container
{
# Manage swap volume properties for experimenting with workarounds listed in
# Manage swap volume properties for experimenting with workarounds listed in
# https://github.com/openzfs/zfs/issues/7734
# https://github.com/openzfs/zfs/issues/7734
zfs
{
"
$
{facts['rpool']}/swap"
:
zfs
{
"
$
{facts['rpool']}/swap"
:
...
...
manifests/lib/srv.pp
View file @
135fdcac
...
@@ -4,18 +4,23 @@ define nest::lib::srv (
...
@@ -4,18 +4,23 @@ define nest::lib::srv (
Optional
[
String
]
$owner
=
undef
,
Optional
[
String
]
$owner
=
undef
,
Optional
[
String
]
$group
=
undef
,
Optional
[
String
]
$group
=
undef
,
)
{
)
{
ensure_resource
(
'zfs'
,
'srv'
,
{
unless
$::is_container
{
'name'
=>
"
$
{facts['rpool']}/srv"
,
ensure_resource
(
'zfs'
,
'srv'
,
{
'mountpoint'
=>
'/srv'
,
'name'
=>
"
$
{facts['rpool']}/srv"
,
})
'mountpoint'
=>
'/srv'
,
})
if
$zfs
{
if
$zfs
{
zfs
{
"srv/
${name}
"
:
zfs
{
"srv/
${name}
"
:
name
=>
"
$
{facts['rpool']}/srv/
${name}
"
,
name
=>
"
$
{facts['rpool']}/srv/
${name}
"
,
mountpoint
=>
"/srv/
${name}
"
,
mountpoint
=>
"/srv/
${name}
"
,
require
=>
Zfs
[
'srv'
],
require
=>
Zfs
[
'srv'
],
before
=>
File
[
"/srv/
${name}
"
],
before
=>
File
[
"/srv/
${name}
"
],
}
}
}
Zfs
[
'srv'
]
->
File
[
"/srv/
${name}
"
]
}
}
file
{
"/srv/
${name}
"
:
file
{
"/srv/
${name}
"
:
...
@@ -23,6 +28,5 @@ define nest::lib::srv (
...
@@ -23,6 +28,5 @@ define nest::lib::srv (
mode
=>
$mode
,
mode
=>
$mode
,
owner
=>
$owner
,
owner
=>
$owner
,
group
=>
$group
,
group
=>
$group
,
require
=>
Zfs
[
'srv'
],
}
}
}
}
manifests/lib/systemd_reload.pp
View file @
135fdcac
define
nest::lib::systemd_reload
{
define
nest::lib::systemd_reload
{
$exec_noop
=
$facts
[
'virtual'
]
==
'lxc'
exec
{
"systemd-daemon-reload-
${name}
"
:
exec
{
"systemd-daemon-reload-
${name}
"
:
command
=>
'/bin/systemctl daemon-reload'
,
command
=>
'/bin/systemctl daemon-reload'
,
refreshonly
=>
true
,
refreshonly
=>
true
,
noop
=>
$
exec_noop
,
noop
=>
$
::is_container
,
}
}
}
}
site.pp
View file @
135fdcac
...
@@ -11,7 +11,7 @@ unless defined('$role') {
...
@@ -11,7 +11,7 @@ unless defined('$role') {
case
$facts
[
'osfamily'
]
{
case
$facts
[
'osfamily'
]
{
'Gentoo'
:
{
'Gentoo'
:
{
$is_container
=
$facts
[
'virtual'
]
==
'lxc'
$is_container
=
$facts
[
'virtual'
]
==
'lxc'
or
$facts
[
'build'
]
Service
{
Service
{
provider
=>
systemd
,
provider
=>
systemd
,
...
...
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