Merge pull request #563 from jhejl/systemd_reverse_dep_by_wantedby_

Let docker.service start docker services managed by puppetlabs/docker…
puppetlabs · Feb 25, 2020 · 0196436 · 0196436
2 parents f6810ce + ead63eb
commit 0196436
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/spec/defines/run_spec.rb b/spec/defines/run_spec.rb
@@ -74,6 +74,7 @@
 
         if systemd
           it { is_expected.to contain_file(initscript).with_content(%r{^SyslogIdentifier=docker-sample$}) }
+          it { is_expected.to contain_file(initscript).with_content(%r{^WantedBy=docker.service$}) }
         end
       end
 
@@ -104,6 +105,7 @@
           it { is_expected.to contain_file(initscript).with_content(%r{Requires=(.*\s+)?docker-foo.service}) }
           it { is_expected.to contain_file(initscript).with_content(%r{Requires=(.*\s+)?docker-bar.service}) }
           it { is_expected.to contain_file(initscript).with_content(%r{Requires=(.*\s+)?docker-foo_bar-baz.service}) }
+          it { is_expected.to contain_file(initscript).with_content(%r{WantedBy=docker.service}) }
         else
           it { is_expected.to contain_file(initscript).with_content(%r{Required-Start:.*\s+docker-foo}) }
           it { is_expected.to contain_file(initscript).with_content(%r{Required-Start:.*\s+docker-bar}) }
@@ -132,6 +134,7 @@
             it { is_expected.to contain_file(initscript).with_content(%r{Requires=(.*\s+)?foo.service(\s+|$)}) }
             it { is_expected.to contain_file(initscript).with_content(%r{Requires=(.*\s+)?bar.service(\s+|$)}) }
             it { is_expected.to contain_file(initscript).with_content(%r{Requires=(.*\s+)?baz.target(\s+|$)}) }
+            it { is_expected.to contain_file(initscript).with_content(%r{WantedBy=docker.service}) }
           end
         else
           it { is_expected.to contain_file(initscript).with_content(%r{Required-Start:.*\s+foo}) }
@@ -141,6 +144,17 @@
         end
       end
 
+      context 'with different docker service name' do
+        # let(:pre_condition) { ["class { 'docker': docker_group => 'docker', service_name => 'dockerd', service_provider => systemd, acknowledge_unsupported_os => true }"] }
+        let(:pre_condition) { pre_condition.gsub("service_name => 'docker'", "service_name => 'dockerd'") }
+
+        let(:params) { params }
+
+        if systemd
+          it { is_expected.to contain_file(initscript).with_content(%r{^WantedBy=dockerd.service$}) }
+        end
+      end
+
       context 'removing containers and volumes' do
         context 'when trying to remove the volume and not the container on stop' do
           let(:params) do

diff --git a/templates/etc/systemd/system/docker-run.erb b/templates/etc/systemd/system/docker-run.erb
@@ -36,3 +36,6 @@ RemainAfterExit=<%= @remain_after_exit %>
 
 [Install]
 WantedBy=multi-user.target
+<%- if @service_name -%>
+WantedBy=<%= @service_name %>.service
+<%- end -%>