Skip to content

Commit 602445b

Browse files
committed
Debian family: install NSS libraries when managing resolved
Fixes #526.
1 parent 7c0e123 commit 602445b

File tree

4 files changed

+28
-3
lines changed

4 files changed

+28
-3
lines changed

REFERENCE.md

+9
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ The following parameters are available in the `systemd` class:
115115
* [`manage_resolved`](#-systemd--manage_resolved)
116116
* [`resolved_ensure`](#-systemd--resolved_ensure)
117117
* [`resolved_package`](#-systemd--resolved_package)
118+
* [`resolved_libraries`](#-systemd--resolved_libraries)
118119
* [`manage_nspawn`](#-systemd--manage_nspawn)
119120
* [`nspawn_package`](#-systemd--nspawn_package)
120121
* [`dns`](#-systemd--dns)
@@ -253,6 +254,14 @@ The name of a systemd sub package needed for systemd-resolved if one needs to be
253254

254255
Default value: `undef`
255256

257+
##### <a name="-systemd--resolved_libraries"></a>`resolved_libraries`
258+
259+
Data type: `Array[String[1]]`
260+
261+
List of library packages needed for systemd-resolved.
262+
263+
Default value: `[]`
264+
256265
##### <a name="-systemd--manage_nspawn"></a>`manage_nspawn`
257266

258267
Data type: `Boolean`

data/Debian-family.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,7 @@
22
systemd::nspawn_package: 'systemd-container'
33
systemd::journal_upload::package_name: 'systemd-journal-remote'
44
systemd::journal_remote::package_name: 'systemd-journal-remote'
5+
systemd::resolved_libraries:
6+
- libnss-myhostname
7+
- libnss-resolve
8+
- libnss-systemd

manifests/init.pp

+4
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@
3131
# @param resolved_package
3232
# The name of a systemd sub package needed for systemd-resolved if one needs to be installed.
3333
#
34+
# @param resolved_libraries
35+
# List of library packages needed for systemd-resolved.
36+
#
3437
# @param manage_nspawn
3538
# Manage the systemd-nspawn@service and machinectl subsystem.
3639
#
@@ -260,6 +263,7 @@
260263
Stdlib::CreateResources $unit_files = {},
261264
Boolean $manage_resolved = false,
262265
Optional[Enum['systemd-resolved']] $resolved_package = undef,
266+
Array[String[1]] $resolved_libraries = [],
263267
Enum['stopped','running'] $resolved_ensure = 'running',
264268
Optional[Variant[Array[String],String]] $dns = undef,
265269
Optional[Variant[Array[String],String]] $fallback_dns = undef,

manifests/install.pp

+11-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,17 @@
1414
}
1515
}
1616

17-
if $systemd::manage_resolved and $systemd::resolved_package {
18-
package { $systemd::resolved_package:
19-
ensure => present,
17+
if $systemd::manage_resolved {
18+
if $systemd::resolved_package {
19+
package { $systemd::resolved_package:
20+
ensure => installed,
21+
}
22+
}
23+
24+
$systemd::resolved_libraries.each |String[1] $pkg| {
25+
package { $pkg:
26+
ensure => installed,
27+
}
2028
}
2129
}
2230

0 commit comments

Comments
 (0)