From fdc2082c618e596aa81082bdf2974667d4c019fc Mon Sep 17 00:00:00 2001
From: John Robbins <j.reboss@gmail.com>
Date: Tue, 11 Apr 2023 09:13:40 -0600
Subject: [PATCH] [rootless docker] Use service where possible

---
 tasks/docker-rootless.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tasks/docker-rootless.yml b/tasks/docker-rootless.yml
index 553c467..9860a52 100644
--- a/tasks/docker-rootless.yml
+++ b/tasks/docker-rootless.yml
@@ -7,13 +7,13 @@
     state: present
 
 - name: Stop any running root instances of docker daemon
-  systemd:
+  service:
     name: docker.service
     state: stopped
     enabled: false
 
 - name: Close root docker socket
-  systemd:
+  service:
     name: docker.socket
     state: stopped
     enabled: false
@@ -32,9 +32,10 @@
   become: false
   systemd:
     name: docker.service
-    state: restarted
-    enabled: true
+    state: "{{ docker_service_state }}"
+    enabled: "{{ docker_service_enabled }}"
     scope: user
+  ignore_errors: "{{ ansible_check_mode }}"
 
 - name: Decouple rootless docker from user session
   command: "loginctl enable-linger {{ ansible_user }}"