fix(service): change default service name

docker/defaults.yaml

@@ -39,7 +39,7 @@ docker:
 
       name: docker-ce
       service:
-        name: dockerd
+        name: docker
         env: ''
       suffix: tgz
       commands:

docker/files/default/systemd.ini.jinja

@@ -5,7 +5,7 @@
 Description={{ desc }}
 Wants=network-online.target
 After=
-Documentation=https://github.com/saltstack-formulas/prometheus-formula
+Documentation=https://docs.docker.com
 
 [Service]
 User={{ user }}

docker/software/archive/install.sls

@@ -94,7 +94,7 @@
         workdir: {{ d.dir.lib }}
         env: {{ d.pkg.docker.service.env }}
         stop: ''
-        start: {{ d.pkg.docker.path }}/{{ d.pkg.docker.service.name }}
+        start: {{ d.pkg.docker.path }}/dockerd
   cmd.run:
     - name: systemctl daemon-reload
     - require:

docker/software/service/running.sls

@@ -44,12 +44,13 @@ include:
         {%- endif %}
     - enable: True
         {%- if grains.kernel|lower == 'linux' %}
-    - onlyif: systemctl list-unit-files | grep {{ d.pkg.docker.service.name }} >/dev/null 2>&1
 
 {{ formula }}-software-service-running-docker-fail-notify:
-  test.show_notification:
-    - text: |
-        * Rebooting your host is recommended!
+  test.fail_without_changes:
+    - comment: |
+        Formula is trying to start '{{ d.pkg.docker.service.name }}' service
+        but failed, is it a correct name for Docker service in your OS?
+
         In certain circumstances the docker service will not start.
         Your kernel is missing some modules, or not in ideal state.
         See https://github.com/moby/moby/blob/master/contrib/check-config.sh

pillar.example

@@ -9,6 +9,7 @@ docker:
   pkg:
     docker:
       service:
+        name: docker
         env: HTTP_PROXY=http://YOUR_PROXY_IP_ADDRESS:PROXY_PORT
       environ:
         # yamllint disable-line rule:line-length

test/integration/archive/controls/service.rb

@@ -3,9 +3,9 @@
 control 'Docker service' do
   title 'should be running and enabled'
 
-  describe service('dockerd') do
+  describe service('docker') do
     it { should be_installed }
     it { should be_enabled }
-    # it { should be_running }
+    it { should be_running } unless %w[fedora suse].include? platform[:family]
   end
 end

test/integration/package/controls/service.rb

@@ -3,8 +3,9 @@
 control 'Docker service' do
   title 'should be running and enabled'
 
-  # describe service(name) do
-  #   it { should be_enabled }
-  #   it { should be_running }
-  # end
+  describe service('docker') do
+    it { should be_installed }
+    it { should be_enabled }
+    it { should be_running }
+  end
 end