From c01ee3714b5a61e73776c79de1f882eb5cffbd25 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen@cern.ch>
Date: Thu, 2 Jun 2022 21:27:58 +0200
Subject: [PATCH] New create_user parameter on main class

Currently when specifying `docker_users` every user is
both created and added to the docker group.

If `create_user` is false then the users are presumed to exist
via another method outside this module and will only be added to
the docker group.

Fixes #840
---
 manifests/config.pp       | 7 +++++--
 manifests/init.pp         | 4 ++++
 spec/classes/init_spec.rb | 1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/manifests/config.pp b/manifests/config.pp
index b2121b25..cbc5b3f4 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -1,9 +1,12 @@
-# @summary
+# @summary Configuration for docker
+# @api private
 #
 class docker::config {
   if $facts['os']['family'] != 'windows' {
     $docker::docker_users.each |$user| {
-      docker::system_user { $user: }
+      docker::system_user { $user:
+        create_user => $docker::create_user,
+      }
     }
   } else {
     $docker::docker_users.each |$user| {
diff --git a/manifests/init.pp b/manifests/init.pp
index 07f833a0..9c54ac6d 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -259,6 +259,9 @@
 # @param docker_users
 #   Specify an array of users to add to the docker group
 #
+# @param create_user
+#   If `true` the list of `docker_users` will be created as well as added to the docker group
+#
 # @param docker_group
 #   Specify a string for the docker group
 #
@@ -446,6 +449,7 @@
   Optional[String]                        $package_source                    = $docker::params::package_source,
   Optional[String]                        $service_name                      = $docker::params::service_name,
   Array                                   $docker_users                      = [],
+  Boolean                                 $create_user                       = true,
   String                                  $docker_group                      = $docker::params::docker_group,
   Array                                   $daemon_environment_files          = [],
   Optional[Variant[String,Hash]]          $repo_opt                          = $docker::params::repo_opt,
diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb
index 0e4ab609..a2d3fb5e 100644
--- a/spec/classes/init_spec.rb
+++ b/spec/classes/init_spec.rb
@@ -65,6 +65,7 @@
             'apt_source_pin_level'              => defaults['apt_source_pin_level'],
             'bip'                               => defaults['bip'],
             'bridge'                            => defaults['bridge'],
+            'create_user'                       => true,
             'daemon_environment_files'          => [],
             'default_gateway_ipv6'              => defaults['default_gateway_ipv6'],
             'default_gateway'                   => defaults['default_gateway'],