CLOUD-1854-Fixing github issue #213

# Conflicts:
#	spec/classes/docker_windows_spec.rb

Author: Mark Wilson

manifests/init.pp

@@ -595,7 +595,7 @@
   contain 'docker::config'
   contain 'docker::service'
 
-  Class['docker::repos'] -> Class['docker::install'] -> Class['docker::config'] ~> Class['docker::service']
+  Class['docker::repos'] -> Class['docker::install'] -> Class['docker::config'] -> Class['docker::service']
   Class['docker'] -> Docker::Registry <||> -> Docker::Image <||>
   Class['docker'] -> Docker::Image <||>
   Class['docker'] -> Docker::Run <||>

spec/acceptance/docker_spec.rb

@@ -5,6 +5,20 @@
   service_name = 'docker'
   command = 'docker'
 
+  context 'When adding system user' do
+    let(:pp) {"
+            class { 'docker':
+              docker_users => ['user1']
+            }
+    "}
+
+     it 'the docker daemon' do
+       apply_manifest(pp, :catch_failures=>true) do |r|
+         expect(r.stdout).to_not match(/docker-systemd-reload-before-service/)
+       end
+     end
+   end
+
   context 'with default parameters' do
     let(:pp) {"
 			class { 'docker':

spec/classes/docker_spec.rb

@@ -422,8 +422,7 @@
       it { should compile.with_all_deps }
       it { should contain_class('docker::repos').that_comes_before('Class[docker::install]') }
       it { should contain_class('docker::install').that_comes_before('Class[docker::config]') }
-      it { should contain_class('docker::service').that_subscribes_to('Class[docker::config]') }
-      it { should contain_class('docker::config') }
+      it { should contain_class('docker::config').that_comes_before('Class[docker::service]') }
 
       it { should contain_file(service_config_file).without_content(/icc=/) }
 

spec/defines/services_spec.rb

@@ -71,4 +71,12 @@
     it { is_expected.to compile.with_all_deps }
     it { should contain_exec('test_service docker service remove').with_command(/docker service rm/) }
   end
+
+  context 'when adding a system user' do
+    let(:params) { {
+        'user' => ['user1'],
+    } }
+    it { is_expected.to compile.with_all_deps }
+    it { should_not contain_exec('docker-systemd-reload-before-service') }
+  end
 end

spec/defines/system_user_spec.rb

@@ -11,7 +11,7 @@
 		:operatingsystemmajrelease => '8',
                 :os                        => { :distro => { :codename => 'wheezy' }, :family => 'Debian', :name => 'Debian', :release => { :major => '7', :full => '7.0' } }
 	} }
-
+  
   context 'with default' do
     let(:params) { {'create_user' => true} }
     it { should contain_user('testuser') }