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

facts['virtual'] -> is_container

Facter doesn't recognize buildah containers.
parent 43dcc621
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 = ''
......
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 { [
......
...@@ -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 = []
......
...@@ -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' }
......
...@@ -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":
......
...@@ -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'],
} }
} }
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,
} }
} }
...@@ -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,
......
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