From 236c4cf189a11015a8b228e4f34975862f43bcf0 Mon Sep 17 00:00:00 2001
From: Sergey Malyuk <malyuk.ss@genlab.llc>
Date: Thu, 18 Dec 2025 15:26:34 +0300
Subject: [PATCH] fix ansible-lint errors

---
 roles/docker_ubuntu/defaults/main.yml             |  4 ++--
 roles/docker_ubuntu/meta/main.yml                 |  4 ++--
 roles/docker_ubuntu/molecule/default/converge.yml |  6 +++---
 roles/docker_ubuntu/molecule/default/verify.yml   | 12 ++++++------
 roles/docker_ubuntu/tasks/main.yml                |  6 +++---
 roles/docker_ubuntu/templates/daemon.json.j2      |  2 +-
 roles/docker_ubuntu/vars/main.yml                 |  2 +-
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/roles/docker_ubuntu/defaults/main.yml b/roles/docker_ubuntu/defaults/main.yml
index b9fac9f..85de886 100644
--- a/roles/docker_ubuntu/defaults/main.yml
+++ b/roles/docker_ubuntu/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-du_docker_version: "27.3.1"
-du_registry_mirrors:
+docker_ubuntu_version: "27.3.1"
+docker_ubuntu_registry_mirrors:
   - https://docker.io
   - https://mirror.gcr.io
diff --git a/roles/docker_ubuntu/meta/main.yml b/roles/docker_ubuntu/meta/main.yml
index 332cab7..f6eca81 100644
--- a/roles/docker_ubuntu/meta/main.yml
+++ b/roles/docker_ubuntu/meta/main.yml
@@ -10,8 +10,8 @@ galaxy_info:
 
   platforms:
     - name: "Ubuntu"
-      versions: [ "focal", "jammy", "noble" ]
+      versions: ["focal", "jammy", "noble"]
 
-  galaxy_tags: [ "docker" ]
+  galaxy_tags: ["docker"]
 
 dependencies: []
diff --git a/roles/docker_ubuntu/molecule/default/converge.yml b/roles/docker_ubuntu/molecule/default/converge.yml
index b67f3d0..d3e24f2 100644
--- a/roles/docker_ubuntu/molecule/default/converge.yml
+++ b/roles/docker_ubuntu/molecule/default/converge.yml
@@ -2,8 +2,8 @@
 - name: Converge
   hosts: all
   roles:
-    - role: genlab.docker_ubuntu
-      du_docker_version: "27.3.1"
-      du_registry_mirrors:
+    - role: genlab.common.docker_ubuntu
+      docker_ubuntu_version: "27.3.1"
+      docker_ubuntu_registry_mirrors:
         - https://docker.io
         - https://mirror.gcr.io
diff --git a/roles/docker_ubuntu/molecule/default/verify.yml b/roles/docker_ubuntu/molecule/default/verify.yml
index ccc781d..a384184 100644
--- a/roles/docker_ubuntu/molecule/default/verify.yml
+++ b/roles/docker_ubuntu/molecule/default/verify.yml
@@ -9,7 +9,7 @@
     - name: "Include default vars"
       ansible.builtin.include_vars:
         dir: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}/defaults/"
-        extensions: [ 'yml' ]
+        extensions: ['yml']
 
     - name: "Sanity check Docker by running a `hello-world` container"  # noqa: no-changed-when
       ansible.builtin.command:
@@ -19,13 +19,13 @@
       ansible.builtin.command:
         cmd: "docker compose version"
 
-    - name: "Check if Docker has the expected version"  # noqa: no-changed-when
-      register: docker_version
+    - name: "Get docker version"  # noqa: no-changed-when
+      register: docker_ubuntu_current_version
       ansible.builtin.command:
         cmd: "docker version --format '{{ '{{' }} .Server.Version {{ '}}' }}'"
 
     - name: "Check if Docker has the expected version"  # noqa: no-changed-when
       ansible.builtin.assert:
-        that: "du_docker_version in docker_version.stdout"
-        success_msg: "Docker has the expected version ({{ docker_version.stdout }} )"
-        fail_msg: "Unexpected Docker version ({{ docker_version.stdout }})"
+        that: "docker_ubuntu_version in docker_ubuntu_current_version.stdout"
+        success_msg: "Docker has the expected version ({{ docker_ubuntu_current_version.stdout }} )"
+        fail_msg: "Unexpected Docker version ({{ docker_ubuntu_current_version.stdout }})"
diff --git a/roles/docker_ubuntu/tasks/main.yml b/roles/docker_ubuntu/tasks/main.yml
index 9d0fa75..ec14880 100644
--- a/roles/docker_ubuntu/tasks/main.yml
+++ b/roles/docker_ubuntu/tasks/main.yml
@@ -35,8 +35,8 @@
   notify: "Sanity check"
   ansible.builtin.apt:
     pkg:
-      - docker-ce={{ du_docker_version_full }}
-      - docker-ce-cli={{ du_docker_version_full }}
+      - docker-ce={{ docker_ubuntu_version_full }}
+      - docker-ce-cli={{ docker_ubuntu_version_full }}
     state: present
     update_cache: true
 
@@ -48,7 +48,7 @@
 
 - name: "Install Python tools for Docker"
   ansible.builtin.pip:
-    name: [ docker ]
+    name: [docker]
     break_system_packages: true
 
 - name: "Configure Docker daemon"
diff --git a/roles/docker_ubuntu/templates/daemon.json.j2 b/roles/docker_ubuntu/templates/daemon.json.j2
index b557ee6..d128e9a 100644
--- a/roles/docker_ubuntu/templates/daemon.json.j2
+++ b/roles/docker_ubuntu/templates/daemon.json.j2
@@ -1,3 +1,3 @@
 {
-    "registry-mirrors": {{ du_registry_mirrors | to_json }}
+    "registry-mirrors": {{ docker_ubuntu_registry_mirrors | to_json }}
 }
diff --git a/roles/docker_ubuntu/vars/main.yml b/roles/docker_ubuntu/vars/main.yml
index 1455687..3075048 100644
--- a/roles/docker_ubuntu/vars/main.yml
+++ b/roles/docker_ubuntu/vars/main.yml
@@ -1,2 +1,2 @@
 ---
-du_docker_version_full: "5:{{ du_docker_version }}-1~ubuntu.{{ ansible_lsb.release }}~{{ ansible_lsb.codename }}"
+docker_ubuntu_version_full: "5:{{ docker_ubuntu_version }}-1~ubuntu.{{ ansible_lsb.release }}~{{ ansible_lsb.codename }}"