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
45ccb189
Commit
45ccb189
authored
Dec 21, 2020
by
James T. Lee
Browse files
Refactor (refacter?) is_container
parent
5d6067c1
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
34 additions
and
37 deletions
+34
-37
lib/facter/is_container.rb
lib/facter/is_container.rb
+6
-0
manifests/base/bootloader/systemd.pp
manifests/base/bootloader/systemd.pp
+1
-1
manifests/base/containers.pp
manifests/base/containers.pp
+1
-1
manifests/base/puppet.pp
manifests/base/puppet.pp
+8
-9
manifests/base/systemd.pp
manifests/base/systemd.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
+1
-1
manifests/lib/systemd_reload.pp
manifests/lib/systemd_reload.pp
+5
-4
manifests/service/mysql.pp
manifests/service/mysql.pp
+1
-1
site.pp
site.pp
+8
-17
No files found.
lib/facter/is_container.rb
0 → 100644
View file @
45ccb189
Facter
.
add
(
'is_container'
)
do
confine
:kernel
=>
'Linux'
setcode
do
Facter
.
value
(
:virtual
)
==
'lxc'
or
File
.
exist?
'/run/.containerenv'
end
end
manifests/base/bootloader/systemd.pp
View file @
45ccb189
class
nest::base::bootloader::systemd
{
class
nest::base::bootloader::systemd
{
if
$
::
is_container
or
$facts
[
'os'
][
'architecture'
]
=~
/^
(
arm|aarch64
)
/
{
if
$
facts
[
'
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 @
45ccb189
class
nest::base::containers
{
class
nest::base::containers
{
unless
$
::
is_container
{
unless
$
facts
[
'
is_container
'
]
{
zfs
{
'containers'
:
zfs
{
'containers'
:
name
=>
"
$
{facts['rpool']}/containers"
,
name
=>
"
$
{facts['rpool']}/containers"
,
mountpoint
=>
'/var/lib/containers'
,
mountpoint
=>
'/var/lib/containers'
,
...
...
manifests/base/puppet.pp
View file @
45ccb189
...
@@ -57,22 +57,21 @@ class nest::base::puppet {
...
@@ -57,22 +57,21 @@ class nest::base::puppet {
content
=>
"fqdn:
$
{trusted['certname']}.nest
\n
"
,
content
=>
"fqdn:
$
{trusted['certname']}.nest
\n
"
,
}
}
class
{
'::puppet'
:
$puppet_runmode
=
$facts
[
'is_container'
]
?
{
true
=>
'unmanaged'
,
default
=>
'systemd.timer'
,
}
class
{
'puppet'
:
dns_alt_names
=>
$dns_alt_names
,
dns_alt_names
=>
$dns_alt_names
,
dir
=>
'/etc/puppetlabs/puppet'
,
dir
=>
'/etc/puppetlabs/puppet'
,
codedir
=>
'/etc/puppetlabs/code'
,
codedir
=>
'/etc/puppetlabs/code'
,
ssldir
=>
'/etc/puppetlabs/puppet/ssl'
,
ssldir
=>
'/etc/puppetlabs/puppet/ssl'
,
runmode
=>
'systemd.timer'
,
runmode
=>
$puppet_runmode
,
unavailable_runmodes
=>
[
'cron'
],
unavailable_runmodes
=>
[
'cron'
],
}
}
if
$::is_container
{
Exec
<|
title
==
'systemctl-daemon-reload-puppet'
|>
{
noop
=>
true
,
}
}
}
else
{
}
else
{
class
{
'
::
puppet'
:
class
{
'puppet'
:
dns_alt_names
=>
$dns_alt_names
,
dns_alt_names
=>
$dns_alt_names
,
}
}
}
}
...
...
manifests/base/systemd.pp
View file @
45ccb189
...
@@ -50,7 +50,7 @@ class nest::base::systemd {
...
@@ -50,7 +50,7 @@ class nest::base::systemd {
changes
=>
flatten
(
$nsswitch_id_changes
+
$nsswitch_hosts_changes
),
changes
=>
flatten
(
$nsswitch_id_changes
+
$nsswitch_hosts_changes
),
}
}
unless
$
::
is_container
{
unless
$
facts
[
'
is_container
'
]
{
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'
,
...
...
manifests/base/users.pp
View file @
45ccb189
...
@@ -142,7 +142,7 @@ class nest::base::users {
...
@@ -142,7 +142,7 @@ class nest::base::users {
group
=>
'users'
;
group
=>
'users'
;
}
}
if
$
::
is_container
{
if
$
facts
[
'
is_container
'
]
{
$user_homes
=
{}
$user_homes
=
{}
}
else
{
}
else
{
$user_homes
=
{
'james'
=>
'/home/james'
}
$user_homes
=
{
'james'
=>
'/home/james'
}
...
...
manifests/base/zfs.pp
View file @
45ccb189
...
@@ -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
$
::
is_container
{
unless
$
facts
[
'
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 @
45ccb189
...
@@ -4,7 +4,7 @@ define nest::lib::srv (
...
@@ -4,7 +4,7 @@ define nest::lib::srv (
Optional
[
String
]
$owner
=
undef
,
Optional
[
String
]
$owner
=
undef
,
Optional
[
String
]
$group
=
undef
,
Optional
[
String
]
$group
=
undef
,
)
{
)
{
unless
$
::
is_container
{
unless
$
facts
[
'
is_container
'
]
{
ensure_resource
(
'zfs'
,
'srv'
,
{
ensure_resource
(
'zfs'
,
'srv'
,
{
'name'
=>
"
$
{facts['rpool']}/srv"
,
'name'
=>
"
$
{facts['rpool']}/srv"
,
'mountpoint'
=>
'/srv'
,
'mountpoint'
=>
'/srv'
,
...
...
manifests/lib/systemd_reload.pp
View file @
45ccb189
define
nest::lib::systemd_reload
{
define
nest::lib::systemd_reload
{
exec
{
"systemd-daemon-reload-
${name}
"
:
unless
$facts
[
'is_container'
]
{
command
=>
'/bin/systemctl daemon-reload'
,
exec
{
"systemd-daemon-reload-
${name}
"
:
refreshonly
=>
true
,
command
=>
'/bin/systemctl daemon-reload'
,
noop
=>
$::is_container
,
refreshonly
=>
true
,
}
}
}
}
}
manifests/service/mysql.pp
View file @
45ccb189
...
@@ -13,7 +13,7 @@ class nest::service::mysql {
...
@@ -13,7 +13,7 @@ class nest::service::mysql {
service_provider
=>
'systemd'
,
service_provider
=>
'systemd'
,
}
}
unless
$
::
is_container
{
unless
$
facts
[
'
is_container
'
]
{
exec
{
'mysql-tmpfiles-create'
:
exec
{
'mysql-tmpfiles-create'
:
command
=>
'/usr/bin/systemd-tmpfiles --create /usr/lib/tmpfiles.d/mysql.conf'
,
command
=>
'/usr/bin/systemd-tmpfiles --create /usr/lib/tmpfiles.d/mysql.conf'
,
creates
=>
'/run/mysqld'
,
creates
=>
'/run/mysqld'
,
...
...
site.pp
View file @
45ccb189
...
@@ -18,25 +18,16 @@ unless defined('$role') {
...
@@ -18,25 +18,16 @@ unless defined('$role') {
case
$facts
[
'osfamily'
]
{
case
$facts
[
'osfamily'
]
{
'Gentoo'
:
{
'Gentoo'
:
{
$is_container
=
$facts
[
'virtual'
]
==
'lxc'
or
$facts
[
'build'
]
# Effectively disable firewall and service resources in containers
if
$facts
[
'is_container'
]
{
Firewall
{
Firewall
<||>
{
noop
=>
$is_container
,
ensure
=>
absent
,
}
}
Firewallchain
{
noop
=>
$is_container
,
}
Sysctl
{
noop
=>
$is_container
,
}
Service
{
Firewallchain
<||>
{
provider
=>
systemd
,
policy
=>
accept
,
}
}
if
$is_container
{
Service
<||>
{
Service
<||>
{
ensure
=>
undef
,
ensure
=>
undef
,
}
}
...
...
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