fix

Author: acecution

ansible/playbooks/deploy.yml

@@ -3,4 +3,4 @@
   hosts: webservers
   become: yes
   roles:
-    - app_deploy
+    - web_app

ansible/roles/common/tasks/main.yml

@@ -1,45 +1,44 @@
 ---
 - name: System provisioning tasks
+  tags:
+    - common
+    - packages
   block:
     - name: Update apt cache
-      apt:
-        update_cache: yes
+      ansible.builtin.apt:
+        update_cache: true
         cache_valid_time: 3600
-      register: apt_update
-      until: apt_update is success
+      register: common_apt_update
+      until: common_apt_update is success
       retries: 3
       delay: 5
 
     - name: Install common packages
-      apt:
+      ansible.builtin.apt:
         name: "{{ common_packages }}"
         state: present
 
   rescue:
-    - name: "Rescue: fix apt if update failed"
-      command: apt-get update --fix-missing
+    - name: Rescue: fix apt if update failed
       when: ansible_os_family == "Debian"
+      ansible.builtin.command: apt-get update --fix-missing
+      changed_when: false
 
   always:
-    - name: "Always: log completion"
-      file:
+    - name: Always: log completion
+      ansible.builtin.file:
         path: /tmp/common_role_completed
         state: touch
         mode: '0644'
 
-  tags:
-    - common
-    - packages
-
 - name: User management tasks
+  when: common_create_app_user | default(false)
+  tags:
+    - users
   block:
-    - name: Create a dedicated user (if needed)
-      user:
+    - name: Create a dedicated user
+      ansible.builtin.user:
         name: "{{ common_user | default('appuser') }}"
         state: present
         groups: sudo
-        shell: /bin/bash
-
-  when: create_app_user | default(false) | bool
-  tags:
-    - users
+        shell: /bin/bash

ansible/roles/docker/handlers/main.yml

@@ -1,5 +1,5 @@
 ---
 - name: restart docker
-  service:
+  ansible.builtin.service:
     name: docker
     state: restarted

ansible/roles/docker/tasks/main.yml

@@ -1,64 +1,63 @@
 ---
 - name: Docker installation tasks
+  tags:
+    - docker
+    - docker_install
   block:
     - name: Add Docker GPG key
-      apt_key:
+      ansible.builtin.apt_key:
         url: https://download.docker.com/linux/ubuntu/gpg
         state: present
-      register: gpg_result
-      until: gpg_result is success
+      register: docker_gpg_result
+      until: docker_gpg_result is success
       retries: 5
       delay: 10
 
     - name: Add Docker repository
-      apt_repository:
+      ansible.builtin.apt_repository:
         repo: "deb [arch=amd64] https://download.docker.com/linux/ubuntu {{ ansible_distribution_release }} stable"
         state: present
 
     - name: Install Docker packages
-      apt:
+      ansible.builtin.apt:
         name: "{{ docker_packages }}"
         state: present
-        update_cache: yes
+        update_cache: true
 
     - name: Install Python Docker module
-      pip:
+      ansible.builtin.pip:
         name: docker
         state: present
 
   rescue:
-    - name: "Rescue: wait and retry GPG key"
-      pause:
+    - name: Rescue: wait and retry GPG key
+      ansible.builtin.pause:
         seconds: 10
-      when: gpg_result is failed
+      when: docker_gpg_result is failed
 
   always:
-    - name: "Always: ensure Docker service is enabled and started"
-      service:
+    - name: Always ensure Docker service is enabled and started
+      ansible.builtin.service:
         name: docker
         state: started
-        enabled: yes
+        enabled: true
 
+- name: Docker configuration tasks
   tags:
     - docker
-    - docker_install
-
-- name: Docker configuration tasks
+    - docker_config
   block:
     - name: Add user to docker group
-      user:
+      ansible.builtin.user:
         name: "{{ docker_user }}"
         groups: docker
-        append: yes
+        append: true
       notify: restart docker
 
     - name: Configure Docker daemon (optional)
-      template:
+      when: docker_custom_config | default(false)
+      ansible.builtin.template:
         src: daemon.json.j2
         dest: /etc/docker/daemon.json
-      notify: restart docker
-      when: docker_custom_config | default(false) | bool
-
-  tags:
-    - docker
-    - docker_config
+        mode: '0644'
+      notify: restart docker

ansible/roles/web_app/tasks/main.yml

@@ -1,24 +1,25 @@
 ---
-# Wipe logic
 - name: Include wipe tasks
   include_tasks: wipe.yml
-  when: web_app_wipe | bool
+  when: web_app_wipe | default(false)
   tags:
     - web_app_wipe
 
-# Deployment block
 - name: Deploy application with Docker Compose
+  tags:
+    - app_deploy
+    - compose
   block:
     - name: Create application directory
-      file:
+      ansible.builtin.file:
         path: "{{ compose_project_dir }}"
         state: directory
         owner: root
         group: root
         mode: '0755'
 
     - name: Template docker-compose file
-      template:
+      ansible.builtin.template:
         src: docker-compose.yml.j2
         dest: "{{ compose_project_dir }}/docker-compose.yml"
         mode: '0644'
@@ -28,23 +29,19 @@
         project_src: "{{ compose_project_dir }}"
         state: present
         pull: always
-        remove_orphans: yes
+        remove_orphans: true
 
   rescue:
     - name: Rescue - log failure
-      debug:
+      ansible.builtin.debug:
         msg: "Deployment failed for {{ app_name }}"
 
   always:
     - name: Always - check container status
-      command: docker ps --filter "name={{ app_name }}" --format "table {{.Names}}\t{{.Status}}"
+      ansible.builtin.command: docker ps --filter "name={{ app_name }}" --format "table {{.Names}}\t{{.Status}}"
       register: container_status
       changed_when: false
 
     - name: Show container status
-      debug:
-        var: container_status.stdout_lines
-
-  tags:
-    - app_deploy
-    - compose
+      ansible.builtin.debug:
+        var: container_status.stdout_lines

ansible/roles/web_app/tasks/wipe.yml

@@ -1,27 +1,26 @@
 ---
 - name: Wipe application
+  tags:
+    - web_app_wipe
   block:
     - name: Stop and remove containers
       community.docker.docker_compose_v2:
         project_src: "{{ compose_project_dir }}"
         state: absent
-        remove_volumes: yes
-        remove_orphans: yes
-      ignore_errors: yes
+        remove_volumes: true
+        remove_orphans: true
+      ignore_errors: true
 
     - name: Remove docker-compose file
-      file:
+      ansible.builtin.file:
         path: "{{ compose_project_dir }}/docker-compose.yml"
         state: absent
 
     - name: Remove application directory
-      file:
+      ansible.builtin.file:
         path: "{{ compose_project_dir }}"
         state: absent
 
     - name: Log wipe completion
-      debug:
-        msg: "Application {{ app_name }} wiped successfully"
-
-  tags:
-    - web_app_wipe
+      ansible.builtin.debug:
+        msg: "Application {{ app_name }} wiped successfully"