Skip to content

Commit b256772

Browse files
authored
Merge pull request #841 from traylenator/users
New create_user parameter on main class
2 parents f7df65a + c01ee37 commit b256772

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

Diff for: manifests/config.pp

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
# @summary
1+
# @summary Configuration for docker
2+
# @api private
23
#
34
class docker::config {
45
if $facts['os']['family'] != 'windows' {
56
$docker::docker_users.each |$user| {
6-
docker::system_user { $user: }
7+
docker::system_user { $user:
8+
create_user => $docker::create_user,
9+
}
710
}
811
} else {
912
$docker::docker_users.each |$user| {

Diff for: manifests/init.pp

+4
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,9 @@
259259
# @param docker_users
260260
# Specify an array of users to add to the docker group
261261
#
262+
# @param create_user
263+
# If `true` the list of `docker_users` will be created as well as added to the docker group
264+
#
262265
# @param docker_group
263266
# Specify a string for the docker group
264267
#
@@ -446,6 +449,7 @@
446449
Optional[String] $package_source = $docker::params::package_source,
447450
Optional[String] $service_name = $docker::params::service_name,
448451
Array $docker_users = [],
452+
Boolean $create_user = true,
449453
String $docker_group = $docker::params::docker_group,
450454
Array $daemon_environment_files = [],
451455
Optional[Variant[String,Hash]] $repo_opt = $docker::params::repo_opt,

Diff for: spec/classes/init_spec.rb

+1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
'apt_source_pin_level' => defaults['apt_source_pin_level'],
6666
'bip' => defaults['bip'],
6767
'bridge' => defaults['bridge'],
68+
'create_user' => true,
6869
'daemon_environment_files' => [],
6970
'default_gateway_ipv6' => defaults['default_gateway_ipv6'],
7071
'default_gateway' => defaults['default_gateway'],

0 commit comments

Comments
 (0)