X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=fdio.infra.ansible%2Froles%2Fdocker%2Ftasks%2Fmain.yaml;h=e07b29e3631003298d4cf1dba54775cdef3c9498;hb=HEAD;hp=d40e1a44c11c8af12adcbfbd4160686eb31551ae;hpb=2b537c09d4f9819ce62d9a2b7c6d27850358050c;p=csit.git

diff --git a/fdio.infra.ansible/roles/docker/tasks/main.yaml b/fdio.infra.ansible/roles/docker/tasks/main.yaml
index d40e1a44c1..4146dbbadf 100644
--- a/fdio.infra.ansible/roles/docker/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/docker/tasks/main.yaml
@@ -1,12 +1,18 @@
 ---
-# file: roles/docker/tasks/main.yaml
+# file: tasks/main.yaml
 
-- include_tasks: "{{ ansible_distribution|lower }}_{{ ansible_distribution_release }}.yaml"
+- name: "Install Prerequisites Based on OS"
+  ansible.builtin.include_tasks:
+    file: "{{ item }}"
+  with_first_found:
+    - files:
+        - "{{ ansible_os_family }}.yaml"
+        - "default.yaml"
   tags:
     - docker-inst-dependencies
 
-- name: Inst - Docker
-  package:
+- name: "Install Docker"
+  ansible.builtin.package:
     name:
       - "{{ docker_package }}"
       - "{{ docker_package }}-cli"
@@ -14,23 +20,28 @@
   tags:
     - docker-inst-package
 
-- name: Conf - Docker Service
-  service:
+- name: "Enable Docker Service"
+  ansible.builtin.service:
     name: docker
     state: "{{ docker_service_state }}"
     enabled: "{{ docker_service_enabled }}"
+  when:
+    - docker_service_mgr == "systemd"
   tags:
     - docker-conf-service
 
-- name: Conf - Docker Service Directory
-  file:
+- name: "Docker Service Directory"
+  ansible.builtin.file:
     path: "/etc/systemd/system/docker.service.d"
     state: "directory"
+    mode: "0755"
+  when:
+    - docker_service_mgr == "systemd"
   tags:
     - docker-conf-service
 
-- name: Conf - Docker Daemon
-  template:
+- name: "Configure Docker Daemon"
+  ansible.builtin.template:
     src: "templates/daemon.json.j2"
     dest: "/etc/docker/daemon.json"
     owner: "root"
@@ -39,12 +50,13 @@
   notify:
     - "Restart Docker"
   when: >
-    docker_daemon is defined
+    docker_daemon is defined and
+    docker_service_mgr == "systemd"
   tags:
     - docker-conf-daemon
 
-- name: Conf - Docker HTTP Proxy
-  template:
+- name: "Configure Docker HTTP Proxy"
+  ansible.builtin.template:
     src: "templates/docker.service.proxy.http"
     dest: "/etc/systemd/system/docker.service.d/http-proxy.conf"
     owner: "root"
@@ -54,12 +66,13 @@
     - "Restart Docker"
   when: >
     proxy_env is defined and
-    proxy_env.http_proxy is defined
+    proxy_env.http_proxy is defined and
+    docker_service_mgr == "systemd"
   tags:
     - docker-conf-service
 
-- name: Conf - Docker HTTPS Proxy
-  template:
+- name: "Configure Docker HTTPS Proxy"
+  ansible.builtin.template:
     src: "templates/docker.service.proxy.https"
     dest: "/etc/systemd/system/docker.service.d/https-proxy.conf"
     owner: "root"
@@ -69,16 +82,10 @@
     - "Restart Docker"
   when: >
     proxy_env is defined and
-    proxy_env.https_proxy is defined
+    proxy_env.https_proxy is defined and
+    docker_service_mgr == "systemd"
   tags:
     - docker-conf-service
 
-- name: Conf - Users to Docker Group
-  user:
-    name: "{{ ansible_user }}"
-    groups: "docker"
-    append: True
-  tags:
-    - docker-conf-user
-
-- meta: flush_handlers
+- name: "Meta - Flush handlers"
+  ansible.builtin.meta: flush_handlers