Merge pull request #87 from tibeer/fix/make-ansible-lint-happy

Make ansible lint happy

Author: stgraber

roles/ceph/tasks/mds.yml

@@ -7,25 +7,25 @@
     group: ceph
     mode: "0770"
     state: directory
-  register: deploy_mds
+  register: ceph_deploy_mds
   when: '"mds" in ceph_roles'
 
 - name: Create mds keyring
   delegate_to: "{{ lookup('template', 'ceph.monitors.names.j2') | from_yaml | first }}"
   ansible.builtin.command:
     cmd: ceph auth get-or-create mds.{{ inventory_hostname_short }} mon 'profile mds' mgr 'profile mds' mds 'allow *' osd 'allow *'
-  register: mds_keyring
-  when: '"mds" in ceph_roles and deploy_mds.changed'
+  register: ceph_mds_keyring
+  when: '"mds" in ceph_roles and ceph_deploy_mds.changed'
   changed_when: true
 
 - name: Transfer mds keyring
   ansible.builtin.copy:
-    content: "{{ mds_keyring.stdout }}\n"
+    content: "{{ ceph_mds_keyring.stdout }}\n"
     dest: "/var/lib/ceph/mds/ceph-{{ inventory_hostname_short }}/keyring"
     owner: ceph
     group: ceph
     mode: "0660"
-  when: '"mds" in ceph_roles and deploy_mds.changed'
+  when: '"mds" in ceph_roles and ceph_deploy_mds.changed'
 
 - name: Enable ceph mds
   ansible.builtin.systemd:

roles/ceph/tasks/mgr.yml

@@ -7,25 +7,25 @@
     group: ceph
     mode: "0770"
     state: directory
-  register: deploy_mgr
+  register: ceph_deploy_mgr
   when: '"mgr" in ceph_roles'
 
 - name: Create mgr keyring
   delegate_to: "{{ lookup('template', 'ceph.monitors.names.j2') | from_yaml | first }}"
   ansible.builtin.command:
     cmd: ceph auth get-or-create mgr.{{ inventory_hostname_short }} mon 'allow profile mgr' osd 'allow *' mds 'allow *'
-  register: mgr_keyring
-  when: '"mgr" in ceph_roles and deploy_mgr.changed'
+  register: ceph_mgr_keyring
+  when: '"mgr" in ceph_roles and ceph_deploy_mgr.changed'
   changed_when: true
 
 - name: Transfer mgr keyring
   ansible.builtin.copy:
-    content: "{{ mgr_keyring.stdout }}\n"
+    content: "{{ ceph_mgr_keyring.stdout }}\n"
     dest: "/var/lib/ceph/mgr/ceph-{{ inventory_hostname_short }}/keyring"
     owner: ceph
     group: ceph
     mode: "0660"
-  when: '"mgr" in ceph_roles and deploy_mgr.changed'
+  when: '"mgr" in ceph_roles and ceph_deploy_mgr.changed'
 
 - name: Enable ceph mgr
   ansible.builtin.systemd:

roles/ceph/tasks/repo_deb.yml

@@ -17,7 +17,7 @@
 
 - name: Get local architecture
   ansible.builtin.command: dpkg --print-architecture
-  register: dpkg_architecture
+  register: ceph_dpkg_architecture
   changed_when: false
   check_mode: false
   when: 'ceph_roles|length > 0 and ceph_release != "distro"'

roles/ceph/tasks/rgw.yml

@@ -7,25 +7,25 @@
     group: ceph
     mode: "0770"
     state: directory
-  register: deploy_rgw
+  register: ceph_deploy_rgw
   when: '"rgw" in ceph_roles'
 
 - name: Create Ceph rgw keyring
   delegate_to: "{{ lookup('template', 'ceph.monitors.names.j2') | from_yaml | first }}"
   ansible.builtin.command:
     cmd: ceph auth get-or-create client.rgw.{{ inventory_hostname_short }} mon 'allow rw' osd 'allow rwx'
-  register: rgw_keyring
-  when: '"rgw" in ceph_roles and deploy_rgw.changed'
+  register: ceph_rgw_keyring
+  when: '"rgw" in ceph_roles and ceph_deploy_rgw.changed'
   changed_when: true
 
 - name: Transfer rgw keyring
   ansible.builtin.copy:
-    content: "{{ rgw_keyring.stdout }}\n"
+    content: "{{ ceph_rgw_keyring.stdout }}\n"
     dest: "/var/lib/ceph/radosgw/ceph-rgw.{{ inventory_hostname_short }}/keyring"
     owner: ceph
     group: ceph
     mode: "0660"
-  when: '"rgw" in ceph_roles and deploy_rgw.changed'
+  when: '"rgw" in ceph_roles and ceph_deploy_rgw.changed'
 
 - name: Enable ceph rgw
   ansible.builtin.systemd:

roles/ceph/templates/ceph.sources.j2

@@ -3,5 +3,5 @@ Types: deb
 URIs: https://download.ceph.com/debian-{{ ceph_release }}
 Suites: {{ ansible_distribution_release }}
 Components: main
-Architectures: {{ dpkg_architecture.stdout }}
+Architectures: {{ ceph_dpkg_architecture.stdout }}
 Signed-By: /etc/apt/keyrings/ansible-ceph.asc

roles/incus/handlers/installation.yml

@@ -14,7 +14,7 @@
       cluster:
         enabled: true
         cluster_address: "{{ incus_ip_address_or_default }}"
-        cluster_token: "{{ cluster_add.stdout }}"
+        cluster_token: "{{ incus_cluster_add.stdout }}"
         server_address: "{{ incus_ip_address_or_default }}"
         member_config:{%- for pool in incus_init.storage %}
       {%- for key in incus_init.storage[pool].local_config | default([]) %}

roles/incus/tasks/installation.yml

@@ -6,15 +6,15 @@
       - incus
     install_recommends: false
     state: present
-  register: install_deb
+  register: incus_install_deb
   when: 'ansible_distribution in ("Debian", "Ubuntu") and incus_roles | length > 0'
 
 - name: Install the Incus package (rpm)
   ansible.builtin.package:
     name:
       - incus
     state: present
-  register: install_rpm
+  register: incus_install_rpm
   when: 'ansible_distribution == "CentOS" and incus_roles | length > 0'
 
 - name: Install the Incus UI package (deb)
@@ -49,9 +49,9 @@
 - name: List installed kernel images
   ansible.builtin.command: >-
     apt list linux-image-* --installed
-  register: linux_image_version
+  register: incus_linux_image_version
   changed_when: false
-  failed_when: "linux_image_version.rc != 0"
+  failed_when: "incus_linux_image_version.rc != 0"
   when: >-
     incus_roles | length > 0 and 'zfs' in incus_init['storage'] |
     dict2items | json_query('[].value.driver') and ansible_distribution == 'Debian'
@@ -61,7 +61,7 @@
     name:
       - linux-headers-{{ item | regex_replace('^linux-image-(.*)/.*$', '\1') }}
     state: present
-  loop: "{{ linux_image_version.stdout_lines | default([]) | select('search', 'linux-image-[0-9]+.*/.*') }}"
+  loop: "{{ incus_linux_image_version.stdout_lines | default([]) | select('search', 'linux-image-[0-9]+.*/.*') }}"
   when: >-
     incus_roles | length > 0 and 'zfs' in incus_init['storage'] |
     dict2items | json_query('[].value.driver') and ansible_distribution == 'Debian'
@@ -84,39 +84,39 @@
 
 - name: Set uid allocation
   ansible.builtin.command: "usermod root --add-subuids 10000000-1009999999"
-  when: '(install_deb.changed or install_rpm.changed) and ansible_distribution == "CentOS"'
+  when: '(incus_install_deb.changed or incus_install_rpm.changed) and ansible_distribution == "CentOS"'
   changed_when: true
 
 - name: Set gid allocation
   ansible.builtin.command: "usermod root --add-subgids 10000000-1009999999"
-  when: '(install_deb.changed or install_rpm.changed) and ansible_distribution == "CentOS"'
+  when: '(incus_install_deb.changed or incus_install_rpm.changed) and ansible_distribution == "CentOS"'
   changed_when: true
 
 - name: Enable incus socket unit
   ansible.builtin.systemd:
     enabled: true
     name: incus.socket
     state: started
-  when: 'install_deb.changed or install_rpm.changed'
+  when: 'incus_install_deb.changed or incus_install_rpm.changed'
 
 - name: Enable incus service unit
   ansible.builtin.systemd:
     enabled: true
     name: incus.service
     state: started
-  when: 'install_deb.changed or install_rpm.changed'
+  when: 'incus_install_deb.changed or incus_install_rpm.changed'
 
 - name: Enable incus startup unit
   ansible.builtin.systemd:
     enabled: true
     name: incus-startup.service
     state: started
-  when: 'install_deb.changed or install_rpm.changed'
+  when: 'incus_install_deb.changed or incus_install_rpm.changed'
 
 - name: Set client listen address
   ansible.builtin.command: "incus --force-local config set core.https_address {{ incus_ip_address_or_default }}"
   when: >-
-    (install_deb.changed or install_rpm.changed) and
+    (incus_install_deb.changed or incus_install_rpm.changed) and
     ("standalone" in incus_roles or ("cluster" in incus_roles and incus_servers[0] == inventory_hostname))
   notify:
     - "Apply additional configuration"
@@ -125,7 +125,7 @@
 
 - name: Set cluster listen address
   ansible.builtin.command: "incus --force-local config set cluster.https_address {{ incus_ip_address_or_default }}"
-  when: '(install_deb.changed or install_rpm.changed) and "cluster" in incus_roles and incus_servers[0] == inventory_hostname'
+  when: '(incus_install_deb.changed or incus_install_rpm.changed) and "cluster" in incus_roles and incus_servers[0] == inventory_hostname'
   changed_when: true
 
 - name: Set OVN NorthBound database
@@ -137,7 +137,7 @@
     network.ovn.ca_cert="{{ lookup('file', ovn_config_dir + '/ca.crt') }}"
   notify: Restart Incus
   when: >-
-    (install_deb.changed or install_rpm.changed) and
+    (incus_install_deb.changed or incus_install_rpm.changed) and
     incus_ovn_northbound and
     ("standalone" in incus_roles or ("cluster" in incus_roles and incus_servers[0] == inventory_hostname))
   changed_when: true
@@ -149,7 +149,7 @@
     {% for k in item.value.config | default([]) %} {{ k }}={{ item.value.config[k] }}{% endfor %}
   loop: "{{ incus_init['network'] | dict2items }}"
   when: >-
-    (install_deb.changed or install_rpm.changed) and
+    (incus_install_deb.changed or incus_install_rpm.changed) and
     ("standalone" in incus_roles or ("cluster" in incus_roles and incus_servers[0] == inventory_hostname))
   changed_when: true
 
@@ -158,7 +158,7 @@
     incus network set --property {{ item.key }} description="{{ item.value.description }}"
   loop: "{{ incus_init['network'] | dict2items }}"
   when: >-
-    (install_deb.changed or install_rpm.changed) and
+    (incus_install_deb.changed or incus_install_rpm.changed) and
     ("standalone" in incus_roles or ("cluster" in incus_roles and incus_servers[0] == inventory_hostname))
     and item.value.description is defined | default(None)
   changed_when: true
@@ -170,15 +170,15 @@
     {{ k }}={{ item.value.config[k] }}{% endfor %}
   loop: "{{ incus_init['storage'] | dict2items }}"
   when: >
-    (install_deb.changed or install_rpm.changed) and
+    (incus_install_deb.changed or incus_install_rpm.changed) and
     ("standalone" in incus_roles or ("cluster" in incus_roles and incus_servers[0] == inventory_hostname))
   changed_when: true
 
 - name: Set storage pool description
   ansible.builtin.command: "incus storage set --property {{ item.key }} description=\"{{ item.value.description }}\""
   loop: "{{ incus_init['storage'] | dict2items }}"
   when: >
-    (install_deb.changed or install_rpm.changed) and
+    (incus_install_deb.changed or incus_install_rpm.changed) and
     ("standalone" in incus_roles or ("cluster" in incus_roles and incus_servers[0] == inventory_hostname)) and
     item.value.description is defined | default(None)
   changed_when: true
@@ -187,15 +187,15 @@
   ansible.builtin.command: "incus profile device add default root disk path=/ pool={{ item }}"
   loop: "{{ incus_init['storage'] | dict2items | json_query('[?value.default].key') }}"
   when: >
-    (install_deb.changed or install_rpm.changed) and
+    (incus_install_deb.changed or incus_install_rpm.changed) and
     ("standalone" in incus_roles or ("cluster" in incus_roles and incus_servers[0] == inventory_hostname))
   changed_when: true
 
 - name: Add network to default profile
   ansible.builtin.command: "incus profile device add default eth0 nic network={{ item }} name=eth0"
   loop: "{{ incus_init['network'] | dict2items | json_query('[?value.default].key') }}"
   when: >
-    (install_deb.changed or install_rpm.changed) and
+    (incus_install_deb.changed or incus_install_rpm.changed) and
     ("standalone" in incus_roles or ("cluster" in incus_roles and incus_servers[0] == inventory_hostname))
   changed_when: true
 
@@ -204,24 +204,24 @@
     incus --force-local config
     set storage.linstor.controller_connection=http://{{ item }}:3370
   loop: "{{ ansible_play_hosts }}"
-  register: register_linstor_controller
+  register: incus_register_linstor_controller
   when: >-
     "controller" in hostvars[item]["ansible_facts"]["linstor_roles"] and
     ansible_distribution == "Ubuntu" and
     ansible_distribution_release != "focal"
-  changed_when: "register_linstor_controller.rc == 0"
+  changed_when: "incus_register_linstor_controller.rc == 0"
 
 - name: Bootstrap the cluster
   ansible.builtin.command: "incus --force-local cluster enable {{ inventory_hostname }}"
-  when: '(install_deb.changed or install_rpm.changed) and "cluster" in incus_roles and incus_servers[0] == inventory_hostname'
+  when: '(incus_install_deb.changed or incus_install_rpm.changed) and "cluster" in incus_roles and incus_servers[0] == inventory_hostname'
   changed_when: true
 
 - name: Create join tokens
   delegate_to: "{{ incus_servers[0] }}"
   ansible.builtin.command: "incus --force-local --quiet cluster add {{ inventory_hostname }}"
-  register: cluster_add
+  register: incus_cluster_add
   notify:
     - Wait 5s to avoid token use before valid
     - Join the cluster
-  when: '(install_deb.changed or install_rpm.changed) and "cluster" in incus_roles and incus_servers[0] != inventory_hostname'
+  when: '(incus_install_deb.changed or incus_install_rpm.changed) and "cluster" in incus_roles and incus_servers[0] != inventory_hostname'
   changed_when: true

roles/incus/tasks/repo_deb.yml

@@ -17,7 +17,7 @@
 
 - name: Get DPKG architecture
   ansible.builtin.command: dpkg --print-architecture
-  register: dpkg_architecture
+  register: incus_dpkg_architecture
   changed_when: false
   check_mode: false
   when: 'incus_roles|length > 0 and incus_release != "distro" and ansible_distribution in ("Ubuntu", "Debian")'

roles/incus/templates/incus.sources.j2

@@ -4,5 +4,5 @@ Types: deb
 URIs: https://pkgs.zabbly.com/incus/{{ incus_release }}/
 Suites: {{ ansible_distribution_release }}
 Components: main
-Architectures: {{ dpkg_architecture.stdout }}
+Architectures: {{ incus_dpkg_architecture.stdout }}
 Signed-By: /etc/apt/keyrings/ansible-zabbly.asc

roles/linstor/tasks/installation.yml

@@ -3,17 +3,17 @@
 - name: List installed linux images
   ansible.builtin.command: >-
     apt list linux-image-* --installed
-  register: linux_image_version
+  register: linstor_linux_image_version
   changed_when: false
-  failed_when: "linux_image_version.rc != 0"
+  failed_when: "linstor_linux_image_version.rc != 0"
   when: '"satellite" in linstor_roles'
 
 - name: Install linux image headers
   ansible.builtin.apt:
     name:
       - linux-headers-{{ item | regex_replace('^linux-image-(.*)/.*$', '\1') }}
     state: present
-  loop: "{{ linux_image_version.stdout_lines | default([]) | select('search', 'linux-image-[0-9]+.*/.*') }}"
+  loop: "{{ linstor_linux_image_version.stdout_lines | default([]) | select('search', 'linux-image-[0-9]+.*/.*') }}"
   when: '"satellite" in linstor_roles'
 
 - name: Install linstor-satellite