fix some ansible-lint warnings

17 files changed, 52 insertions, 46 deletions

diff --git a/roles/apt_install/tasks/main.yml b/roles/apt_install/tasks/main.yml
index 022d9d2..90e96ae 100644
--- a/roles/apt_install/tasks/main.yml
+++ b/roles/apt_install/tasks/main.yml
@@ -4,9 +4,9 @@
     apt_args:
       name: '{{ apt_install_packages }}'
       state: present
-  register: apt_result
+  register: apt_install_result
 
 - name: Show installed packages
   ansible.builtin.debug:
-    var: apt_result.packages
-  when: apt_result is changed
+    var: apt_install_result.packages
+  when: apt_install_result is changed
diff --git a/roles/config_links/tasks/main.yml b/roles/config_links/tasks/main.yml
index b663c4e..6eccf68 100644
--- a/roles/config_links/tasks/main.yml
+++ b/roles/config_links/tasks/main.yml
@@ -9,30 +9,32 @@
   ansible.builtin.tempfile:
     prefix: config-links
     state: directory
-  register: repo
+  register: config_links_repo
 
 - name: Run config-links
   block:
     - name: Checkout config-links repo
+      # noqa: latest[git]
+      # config-links is supposed to be always working if you just check it out.
       ansible.builtin.git:
         repo: 'https://github.com/egor-tensin/config-links.git'
-        dest: '{{ repo.path }}'
+        dest: '{{ config_links_repo.path }}'
         accept_hostkey: true
 
     - name: Run links-update
       ansible.builtin.command:
-        cmd: '{{ repo.path }}/links-update'
+        cmd: '{{ config_links_repo.path }}/links-update'
         chdir: '{{ config_links_path }}'
       when: config_links_action == 'update'
 
     - name: Run links-remove
       ansible.builtin.command:
-        cmd: '{{ repo.path }}/links-remove'
+        cmd: '{{ config_links_repo.path }}/links-remove'
         chdir: '{{ config_links_path }}'
       when: config_links_action == 'remove'
 
   always:
     - name: Clean up
       ansible.builtin.file:
-        path: '{{ repo.path }}'
+        path: '{{ config_links_repo.path }}'
         state: absent
diff --git a/roles/docker/tasks/logging.yml b/roles/docker/tasks/logging.yml
index 2de7a64..52b70c9 100644
--- a/roles/docker/tasks/logging.yml
+++ b/roles/docker/tasks/logging.yml
@@ -3,7 +3,7 @@
   tensin.infra.parse_json_file:
     path: /etc/docker/daemon.json
     default: {}
-  register: daemon_json
+  register: docker_daemon_json
 
 - name: Modify Docker config
   become: true
@@ -19,7 +19,7 @@
     - name: Write daemon.json
       ansible.builtin.copy:
         dest: /etc/docker/daemon.json
-        content: '{{ daemon_json.content | combine({"log-driver": docker_logging_driver}) | to_nice_json }}'
+        content: '{{ docker_daemon_json.content | combine({"log-driver": docker_logging_driver}) | to_nice_json }}'
         owner: root
         group: root
         mode: '644'
diff --git a/roles/docker/tasks/prune.yml b/roles/docker/tasks/prune.yml
index 5170e74..87bd55d 100644
--- a/roles/docker/tasks/prune.yml
+++ b/roles/docker/tasks/prune.yml
@@ -3,14 +3,14 @@
     unitname:
       - docker.service
       - docker.socket
-  register: systemd_info
+  register: docker_systemd_info
 
 - name: Clean up docker data
   become: true
   when: |
-    systemd_info.units['docker.service'].substate == 'running'
-    or systemd_info.units['docker.socket'].substate == 'listening'
-    or systemd_info.units['docker.socket'].substate == 'running'
+    docker_systemd_info.units['docker.service'].substate == 'running'
+    or docker_systemd_info.units['docker.socket'].substate == 'listening'
+    or docker_systemd_info.units['docker.socket'].substate == 'running'
   block:
     # Dependencies of the community.docker.docker_prune Ansible module:
     - name: Install module dependencies
diff --git a/roles/etckeeper/tasks/ignore.yml b/roles/etckeeper/tasks/ignore.yml
index a97ca18..27f72e4 100644
--- a/roles/etckeeper/tasks/ignore.yml
+++ b/roles/etckeeper/tasks/ignore.yml
@@ -3,16 +3,16 @@
   ansible.builtin.command:
     cmd: git status --porcelain
     chdir: /etc
-  register: git_status
+  register: etckeeper_git_status
   changed_when: false
 
 - name: Fail if there're modifications
   ansible.builtin.fail:
     msg: |
       Unexpected modifications found:
-      {{ git_status.stdout }}
+      {{ etckeeper_git_status.stdout }}
   when: |
-    git_status.stdout_lines | length > 0
+    etckeeper_git_status.stdout_lines | length > 0
 
 - name: Configure ignored path
   ansible.builtin.include_tasks: ignore_line.yml
diff --git a/roles/etckeeper/tasks/ignore_line.yml b/roles/etckeeper/tasks/ignore_line.yml
index f965f6f..ec80afb 100644
--- a/roles/etckeeper/tasks/ignore_line.yml
+++ b/roles/etckeeper/tasks/ignore_line.yml
@@ -7,7 +7,6 @@
     owner: root
     group: root
     mode: '644'
-  register: gitignore
   notify: etckeeper_commit_gitignore
 
 - name: Remove path from cache
@@ -15,7 +14,7 @@
   ansible.builtin.command: # noqa: command-instead-of-module
     cmd: git rm -r --ignore-unmatch --cached -- {{ ignore_path | regex_replace("^/", "") | quote }}
     chdir: /etc
-  register: git_rm_result
+  register: etckeeper_git_rm
   changed_when: |
-    git_rm_result.stdout_lines | length > 0
+    etckeeper_git_rm.stdout_lines | length > 0
   notify: etckeeper_commit_gitignore
diff --git a/roles/etckeeper/tasks/main.yml b/roles/etckeeper/tasks/main.yml
index b4c49f2..6266f5b 100644
--- a/roles/etckeeper/tasks/main.yml
+++ b/roles/etckeeper/tasks/main.yml
@@ -58,7 +58,7 @@
         chdir: /etc
       changed_when: false
       failed_when: false
-      register: url_result
+      register: etckeeper_config_result
 
     - name: Fix remote URL if necessary
       ansible.builtin.shell:
@@ -66,7 +66,8 @@
           git remote remove {{ etckeeper_remote_name | quote }} && \
           git remote add -f {{ etckeeper_remote_name | quote }} {{ etckeeper_remote_url | quote }}
         chdir: /etc
-      when: url_result.stdout != etckeeper_remote_url
+      changed_when: true
+      when: etckeeper_config_result.stdout != etckeeper_remote_url
 
     - name: Configure pushes for etckeeper
       community.general.ini_file:
diff --git a/roles/letsencrypt/tasks/digitalocean.yml b/roles/letsencrypt/tasks/digitalocean.yml
index 2dfc1e2..30a7a9c 100644
--- a/roles/letsencrypt/tasks/digitalocean.yml
+++ b/roles/letsencrypt/tasks/digitalocean.yml
@@ -6,18 +6,18 @@
         prompt: |
           Enter your API token:
         echo: false
-      register: digitalocean_token
+      register: letsencrypt_do_token
       when:
         - lookup('env', 'DIGITALOCEAN_TOKEN') | length <= 0
 
     - name: Set token as fact
       ansible.builtin.set_fact:
-        digitalocean_token: "{{ digitalocean_token.user_input | default(lookup('env', 'DIGITALOCEAN_TOKEN')) }}"
+        letsencrypt_do_token: "{{ letsencrypt_do_token.user_input | default(lookup('env', 'DIGITALOCEAN_TOKEN')) }}"
 
     - name: Fail if token is invalid
       ansible.builtin.fail:
         msg: 'DigitalOcean token is invalid'
-      when: digitalocean_token | length == 0
+      when: letsencrypt_do_token | length == 0
 
     - name: Configure certbot.ini
       ansible.builtin.template:
diff --git a/roles/letsencrypt/tasks/domain.yml b/roles/letsencrypt/tasks/domain.yml
index 7179a40..9a9418f 100644
--- a/roles/letsencrypt/tasks/domain.yml
+++ b/roles/letsencrypt/tasks/domain.yml
@@ -11,7 +11,7 @@
         owner: root
         group: root
         mode: '640'
-      register: domain_list
+      register: letsencrypt_domain_list
 
     - name: 'Create certificate: {{ certificate_name }}'
       ansible.builtin.command: |
@@ -23,4 +23,5 @@
             --dns-digitalocean \
             --dns-digitalocean-credentials {{ letsencrypt_credentials_ini | quote }} \
             --dns-digitalocean-propagation-seconds 30
-      when: domain_list.changed
+      changed_when: true
+      when: letsencrypt_domain_list.changed
diff --git a/roles/letsencrypt/templates/certbot.ini.j2 b/roles/letsencrypt/templates/certbot.ini.j2
index 71095d6..938091b 100644
--- a/roles/letsencrypt/templates/certbot.ini.j2
+++ b/roles/letsencrypt/templates/certbot.ini.j2
@@ -1,3 +1,3 @@
 {{ ansible_managed | comment }}
 
-dns_digitalocean_token = {{ digitalocean_token }}
+dns_digitalocean_token = {{ letsencrypt_do_token }}
diff --git a/roles/my_dotfiles/tasks/main.yml b/roles/my_dotfiles/tasks/main.yml
index dd4a664..83ec2a3 100644
--- a/roles/my_dotfiles/tasks/main.yml
+++ b/roles/my_dotfiles/tasks/main.yml
@@ -3,10 +3,10 @@
     repo: '{{ my_dotfiles_repo }}'
     dest: '{{ my_dotfiles_dir }}'
     accept_hostkey: true
-  register: repo
+  register: my_dotfiles_repo
 
 - name: Run setup.sh
   ansible.builtin.command: ./setup.sh
   args:
     chdir: '{{ my_dotfiles_dir }}'
-  when: repo.changed
+  when: my_dotfiles_repo.changed
diff --git a/roles/my_workspace/tasks/project.yml b/roles/my_workspace/tasks/project.yml
index 59661d0..efce065 100644
--- a/roles/my_workspace/tasks/project.yml
+++ b/roles/my_workspace/tasks/project.yml
@@ -31,7 +31,7 @@
         get_checksum: false
         get_mime: false
         follow: true
-      register: makefile_stat
+      register: my_workspace_makefile
 
     - name: Check for docker-compose file
       ansible.builtin.stat:
@@ -40,13 +40,13 @@
         get_checksum: false
         get_mime: false
         follow: true
-      register: compose_file_stat
+      register: my_workspace_compose_file
 
     - name: Run make
       become: true
       community.general.make:
         chdir: '{{ project_dir }}'
-      when: makefile_stat.stat.readable
+      when: my_workspace_makefile.stat.readable
 
     - name: Run docker-compose
       become: true
@@ -55,10 +55,10 @@
         pull: always
         build: always
         remove_orphans: true
-      when: not makefile_stat.stat.readable and compose_file_stat.stat.readable
+      when: not my_workspace_makefile.stat.readable and my_workspace_compose_file.stat.readable
 
     - name: Fail if both files are unreadable
       ansible.builtin.fail:
         msg: |
           Don't know how to run project in {{ project_dir }}
-      when: not (makefile_stat.stat.readable or compose_file_stat.stat.readable)
+      when: not (my_workspace_makefile.stat.readable or my_workspace_compose_file.stat.readable)
diff --git a/roles/nfs/tasks/main.yml b/roles/nfs/tasks/main.yml
index 1f1ae3e..a563a11 100644
--- a/roles/nfs/tasks/main.yml
+++ b/roles/nfs/tasks/main.yml
@@ -23,9 +23,10 @@
     owner: root
     group: root
     mode: '644'
-  register: exports_conf
+  register: nfs_exports_conf
 
 - name: Reload NFS mounts
   become: true
-  when: exports_conf is changed
+  when: nfs_exports_conf is changed
   ansible.builtin.command: /usr/sbin/exportfs -arv
+  changed_when: true
diff --git a/roles/pacman/tasks/rate_mirrors.yml b/roles/pacman/tasks/rate_mirrors.yml
index e4277ec..b0b20b6 100644
--- a/roles/pacman/tasks/rate_mirrors.yml
+++ b/roles/pacman/tasks/rate_mirrors.yml
@@ -1,11 +1,11 @@
 - name: Check for rate-mirrors
   ansible.builtin.command: rate-mirrors --version
-  register: rate_mirrors_version
+  register: pacman_rate_mirrors_version
   changed_when: false
   failed_when: false
 
 - name: Run rate-mirrors
-  when: rate_mirrors_version.rc == 0
+  when: pacman_rate_mirrors_version.rc == 0
   become: true
   ansible.builtin.shell: |
     . /etc/os-release && rate-mirrors \
@@ -13,3 +13,4 @@
         --disable-comments \
         --save /etc/pacman.d/mirrorlist \
         "$ID"
+  changed_when: true
diff --git a/roles/pacman_install/tasks/main.yml b/roles/pacman_install/tasks/main.yml
index b7b4604..691c58e 100644
--- a/roles/pacman_install/tasks/main.yml
+++ b/roles/pacman_install/tasks/main.yml
@@ -5,9 +5,9 @@
     state: present
     reason: explicit
     reason_for: all
-  register: pacman_result
+  register: pacman_install_result
 
 - name: Show installed packages
   ansible.builtin.debug:
     var: pacman_result.packages
-  when: pacman_result.packages is defined and (pacman_result.packages | length > 0)
+  when: pacman_install_result.packages is defined and (pacman_install_result.packages | length > 0)
diff --git a/roles/wireguard/tasks/NetworkManager.yml b/roles/wireguard/tasks/NetworkManager.yml
index dd205f3..30942a3 100644
--- a/roles/wireguard/tasks/NetworkManager.yml
+++ b/roles/wireguard/tasks/NetworkManager.yml
@@ -6,12 +6,13 @@
     owner: root
     group: root
     mode: '600'
-  register: config
+  register: wireguard_config
 
 - name: Reload NetworkManager connections
   become: true
   ansible.builtin.command: nmcli connection reload
-  when: config.changed
+  when: wireguard_config.changed
+  changed_when: true
 
 - name: Set up service dependencies for the interface
   ansible.builtin.include_role:
diff --git a/roles/wireguard/tasks/wg-quick.yml b/roles/wireguard/tasks/wg-quick.yml
index 218cd1a..68df72a 100644
--- a/roles/wireguard/tasks/wg-quick.yml
+++ b/roles/wireguard/tasks/wg-quick.yml
@@ -12,21 +12,21 @@
     owner: root
     group: root
     mode: '600'
-  register: config
+  register: wireguard_config
 
 - name: Enable wg-quick service
   become: true
   ansible.builtin.systemd_service:
     name: 'wg-quick@{{ wg_name }}'
     enabled: '{{ wg_autoconnect }}'
-  when: config.changed
+  when: wireguard_config.changed
 
 - name: Restart wg-quick service
   become: true
   ansible.builtin.systemd_service:
     name: 'wg-quick@{{ wg_name }}'
     state: restarted
-  when: config.changed and wg_autoconnect
+  when: wireguard_config.changed and wg_autoconnect
 
 - name: Set up service dependencies for the interface
   ansible.builtin.include_role: