Allow custom docker_group and service_name values in run.pp (#431)

Author: esalberg

manifests/run.pp

@@ -144,8 +144,8 @@
   }else {
     $docker_command = $docker::params::docker_command
   }
-  $service_name = $docker::params::service_name
-  $docker_group = $docker::params::docker_group
+  $service_name = $docker::service_name
+  $docker_group = $docker::docker_group
 
   if $restart {
     assert_type(Pattern[/^(no|always|unless-stopped|on-failure)|^on-failure:[\d]+$/], $restart)

spec/defines/run_spec.rb

@@ -3,6 +3,7 @@
 ['Debian', 'RedHat'].each do |osfamily|
   describe 'docker::run', :type => :define do
     let(:title) { 'sample' }
+    let(:pre_condition) { "class { 'docker': docker_group => 'docker', service_name => 'docker' }" }
     context "on #{osfamily}" do
 
       initscript = '/etc/systemd/system/docker-sample.service'
@@ -615,30 +616,38 @@
 
       context 'when `docker_service` is true' do
         let(:params) { {'command' => 'command', 'image' => 'base', 'docker_service' => true} }
-        let(:pre_condition) { "service { 'docker': }" }
+        let(:pre_condition) {
+          [ "service { 'docker': }",
+            "class { 'docker': docker_group => 'docker', service_name => 'docker' }" ] }
         it { should compile.with_all_deps }
         it { should contain_service('docker').that_comes_before('Service[docker-sample]') }
         it { should contain_service('docker').that_notifies('Service[docker-sample]') }
       end
 
       context 'when `docker_service` is true and `restart_service_on_docker_refresh` is false' do
         let(:params) { {'command' => 'command', 'image' => 'base', 'docker_service' => true, 'restart_service_on_docker_refresh' => false} }
-        let(:pre_condition) { "service { 'docker': }" }
+        let(:pre_condition) {
+          [ "service { 'docker': }",
+            "class { 'docker': docker_group => 'docker', service_name => 'docker' }" ] }
         it { should compile.with_all_deps }
         it { should contain_service('docker').that_comes_before('Service[docker-sample]') }
       end
 
       context 'when `docker_service` is `my-docker`' do
         let(:params) { {'command' => 'command', 'image' => 'base', 'docker_service' => 'my-docker'} }
-        let(:pre_condition) { "service{ 'my-docker': }" }
+        let(:pre_condition) {
+          [ "service { 'my-docker': }",
+            "class { 'docker': docker_group => 'docker', service_name => 'docker' }" ] }
         it { should compile.with_all_deps }
         it { should contain_service('my-docker').that_comes_before('Service[docker-sample]') }
         it { should contain_service('my-docker').that_notifies('Service[docker-sample]') }
       end
 
       context 'when `docker_service` is `my-docker` and `restart_service_on_docker_refresh` is false' do
         let(:params) { {'command' => 'command', 'image' => 'base', 'docker_service' => 'my-docker', 'restart_service_on_docker_refresh' => false} }
-        let(:pre_condition) { "service{ 'my-docker': }" }
+        let(:pre_condition) {
+          [ "service { 'my-docker': }",
+            "class { 'docker': docker_group => 'docker', service_name => 'docker' }" ] }
         it { should compile.with_all_deps }
         it { should contain_service('my-docker').that_comes_before('Service[docker-sample]') }
       end

spec/defines/run_windows_spec.rb

@@ -2,6 +2,7 @@
 
 describe 'docker::run', :type => :define do
   let(:title) { 'sample' }
+  let(:pre_condition) { 'class { \'docker\': docker_ee => true }' }
   let(:facts) { {
     :architecture               => 'amd64',
     :osfamily                   => 'windows',