From e6ea44ff29087898aa3854946a8b6e3ef73d9d8a Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Wed, 8 Jun 2022 15:38:48 +0200
Subject: [PATCH] Explicit loop variable names

---
 kvm-host/tasks/munin.yml        |  8 +++++---
 redis/tasks/default-munin.yml   |  4 +++-
 redis/tasks/instance-munin.yml  |  4 +++-
 redis/tasks/instance-server.yml | 18 +++++++++++++-----
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/kvm-host/tasks/munin.yml b/kvm-host/tasks/munin.yml
index d0bf1b0a..d16bcfd9 100644
--- a/kvm-host/tasks/munin.yml
+++ b/kvm-host/tasks/munin.yml
@@ -27,16 +27,18 @@
     - kvm_mem
   notify: restart munin-node
 
-- name: Enable redis munin plugin
+- name: Enable Munin plugins
   file:
-    src: "/usr/local/share/munin/plugins/{{item}}"
-    dest: "/etc/munin/plugins/{{item}}"
+    src: "/usr/local/share/munin/plugins/{{ plugin_name }}"
+    dest: "/etc/munin/plugins/{{ plugin_name }}"
     state: link
     force: yes
   loop:
     - kvm_cpu
     - kvm_io
     - kvm_mem
+  loop_control:
+    loop_var: plugin_name
   notify: restart munin-node
 
 - name: Copy Munin plugins conf
diff --git a/redis/tasks/default-munin.yml b/redis/tasks/default-munin.yml
index 7856741e..1c9ab759 100644
--- a/redis/tasks/default-munin.yml
+++ b/redis/tasks/default-munin.yml
@@ -39,7 +39,7 @@
 - name: Enable redis munin plugin
   file:
     src: /usr/local/share/munin/plugins/redis_
-    dest: "/etc/munin/plugins/redis_{{item}}"
+    dest: "/etc/munin/plugins/redis_{{ plugin_name }}"
     state: link
   loop:
     - connected_clients
@@ -48,6 +48,8 @@
     - per_sec
     - used_keys
     - used_memory
+  loop_control:
+    loop_var: plugin_name
   notify: restart munin-node
   when: not ansible_check_mode
   tags:
diff --git a/redis/tasks/instance-munin.yml b/redis/tasks/instance-munin.yml
index 2b664092..72865e98 100644
--- a/redis/tasks/instance-munin.yml
+++ b/redis/tasks/instance-munin.yml
@@ -39,7 +39,7 @@
 - name: Enable redis munin plugin
   file:
     src: /usr/local/share/munin/plugins/redis_
-    dest: "/etc/munin/plugins/{{ redis_instance_name }}_redis_{{item}}"
+    dest: "/etc/munin/plugins/{{ redis_instance_name }}_redis_{{ plugin_name }}"
     state: link
   loop:
     - connected_clients
@@ -48,6 +48,8 @@
     - per_sec
     - used_keys
     - used_memory
+  loop_control:
+    loop_var: plugin_name
   notify: restart munin-node
   when: not ansible_check_mode
   tags:
diff --git a/redis/tasks/instance-server.yml b/redis/tasks/instance-server.yml
index 462ee8f4..3e6af623 100644
--- a/redis/tasks/instance-server.yml
+++ b/redis/tasks/instance-server.yml
@@ -38,7 +38,7 @@
 
 - name: "Instance '{{ redis_instance_name }}' config hooks directories are present"
   file:
-    dest: "{{ item }}"
+    dest: "{{ _dir }}"
     mode: "0755"
     owner: "root"
     group: "root"
@@ -49,6 +49,8 @@
     - "{{ redis_conf_dir }}/redis-server.post-up.d"
     - "{{ redis_conf_dir }}/redis-server.pre-down.d"
     - "{{ redis_conf_dir }}/redis-server.post-down.d"
+  loop_control:
+    loop_var: _dir
   when:
     - ansible_distribution == "Debian"
     - ansible_distribution_major_version is version('9', '=')
@@ -56,14 +58,16 @@
     - redis
 
 - name: "Instance '{{ redis_instance_name }}' hooks examples are present"
-  command: "cp -a /etc/redis/{{ item }}/00_example {{ redis_conf_dir }}/{{ item }}"
+  command: "cp -a /etc/redis/{{ _dir }}/00_example {{ redis_conf_dir }}/{{ _dir }}"
   args:
-    creates: "{{ redis_conf_dir }}/{{ item }}/00_example"
+    creates: "{{ redis_conf_dir }}/{{ _dir }}/00_example"
   loop:
     - "redis-server.pre-up.d"
     - "redis-server.post-up.d"
     - "redis-server.pre-down.d"
     - "redis-server.post-down.d"
+  loop_control:
+    loop_var: _dir
   when:
     - ansible_distribution == "Debian"
     - ansible_distribution_major_version is version('9', '=')
@@ -72,7 +76,7 @@
 
 - name: "Instance '{{ redis_instance_name }}' socket/pid directories are present"
   file:
-    dest: "{{ item }}"
+    dest: "{{ _dir }}"
     mode: "0755"
     owner: "redis-{{ redis_instance_name }}"
     group: "redis-{{ redis_instance_name }}"
@@ -81,12 +85,14 @@
   loop:
     - "{{ redis_pid_dir }}"
     - "{{ redis_socket_dir }}"
+  loop_control:
+    loop_var: _dir
   tags:
     - redis
 
 - name: "Instance '{{ redis_instance_name }}' data/log directories are present"
   file:
-    dest: "{{ item }}"
+    dest: "{{ _dir }}"
     mode: "0751"
     owner: "redis-{{ redis_instance_name }}"
     group: "redis-{{ redis_instance_name }}"
@@ -95,6 +101,8 @@
   loop:
     - "{{ redis_data_dir }}"
     - "{{ redis_log_dir }}"
+  loop_control:
+    loop_var: _dir
   tags:
     - redis