From 20485d9a42e9407e7ab31589474fa54c7a2aa22f Mon Sep 17 00:00:00 2001 From: Johan De Wit Date: Fri, 29 Sep 2017 14:23:29 +0200 Subject: [PATCH] use the docker_group from init instead param --- manifests/run.pp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/manifests/run.pp b/manifests/run.pp index 74ddbae17..75b59c27b 100755 --- a/manifests/run.pp +++ b/manifests/run.pp @@ -110,7 +110,10 @@ $stop_wait_time = 0, $syslog_identifier = undef, ) { + include docker::params + include docker + if ($socket_connect != []) { $sockopts = join(any2array($socket_connect), ',') $docker_command = "${docker::params::docker_command} -H ${sockopts}" @@ -118,7 +121,7 @@ $docker_command = $docker::params::docker_command } $service_name = $docker::params::service_name - $docker_group = $docker::params::docker_group + $docker_group = $docker::docker_group validate_re($image, '^[\S]*$') validate_re($title, '^[\S]*$')