more linting errors

Author: scrungus

roles/os_images/tasks/images.yml

@@ -1,9 +1,8 @@
 ---
 - name: Include OS family-specific variables
-  include_vars: "{{ ansible_facts.os_family }}.yml"
-
+  ansible.builtin.include_vars: "{{ ansible_facts.os_family }}.yml"
 - name: Ensure required packages are installed
-  package:
+  ansible.builtin.package:
     name: "{{ (os_images_package_dependencies + os_images_package_dependencies_extra) | select | list }}"
     state: present
   become: true
@@ -12,7 +11,7 @@
 - name: Ensure diskimage-builder SELinux dependencies are installed
   vars:
     package_name: "{{ 'policycoreutils-python' if ansible_facts.distribution_major_version | int == 7 else 'python3-policycoreutils' }}"
-  package:
+  ansible.builtin.package:
     name: "{{ package_name }}"
     state: present
   when:
@@ -22,15 +21,15 @@
   become: true
 
 - name: Ensure download cache dir exists
-  file:
+  ansible.builtin.file:
     path: "{{ os_images_cache }}"
     owner: "{{ ansible_facts.user_uid }}"
     group: "{{ ansible_facts.user_gid }}"
     state: directory
   become: true
 
 - name: Remove old images for force rebuild
-  file:
+  ansible.builtin.file:
     path: "{{ os_images_cache }}/{{ item.name }}"
     state: absent
   when: item.force_rebuild | default(os_images_force_rebuild) | bool
@@ -40,7 +39,7 @@
   tags: clean
 
 - name: Generate per-image cache directories
-  file:
+  ansible.builtin.file:
     path: "{{ os_images_cache }}/{{ item.name }}"
     owner: "{{ ansible_facts.user_uid }}"
     group: "{{ ansible_facts.user_gid }}"
@@ -50,28 +49,28 @@
     label: "{{ item.name }}"
   become: true
 
-- block:
+- vars:
+    image_dest: "{{ os_images_cache }}/{{ item.name }}/{{ item.name }}.{{ item.type | default('qcow2') }}{{ '.xz' if image_is_xz else '' }}"
+    image_is_xz: "{{ item.image_url.endswith('.xz') }}"
+  when: item.image_url is defined
+
+  block:
     - name: Download the image to the directory when an image_url is defined
-      get_url:
+      ansible.builtin.get_url:
         url: "{{ item.image_url }}"
         dest: "{{ image_dest }}"
         checksum: "{{ item.checksum | default(omit) }}"
       with_items: "{{ os_images_list | list }}"
       loop_control:
         label: "{{ item.name }}"
     - name: Unpack the image if .xz format
-      command: unxz --keep --force {{ image_dest }}
+      ansible.builtin.command: unxz --keep --force {{ image_dest }}
       when: image_is_xz
       with_items: "{{ os_images_list | list }}"
       loop_control:
         label: "{{ item.name }}"
-  vars:
-    image_dest: "{{ os_images_cache }}/{{ item.name }}/{{ item.name }}.{{ item.type | default('qcow2') }}{{ '.xz' if image_is_xz else '' }}"
-    image_is_xz: "{{ item.image_url.endswith('.xz') }}"
-  when: item.image_url is defined
-
 - name: Install a suitable version of diskimage-builder
-  pip:
+  ansible.builtin.pip:
     name: "{{ item.name }}"
     version: "{{ item.version or omit }}"
     state: "{{ os_images_package_state }}"
@@ -82,39 +81,35 @@
       version: "{{ os_images_dib_version }}"
 
 - name: Git clone any additional image element repos
-  git:
+  ansible.builtin.git:
     repo: "{{ item.repo }}"
     dest: "{{ item.local }}"
     version: "{{ item.version | default('HEAD') }}"
   with_items: "{{ os_images_git_elements }}"
 
 - name: Set a fact containing paths to DIB elements
-  set_fact:
+  ansible.builtin.set_fact:
     os_images_elements_path: "{{ os_images_elements }}"
 
 - name: Incorporate git-sourced DIB elements
-  set_fact:
+  ansible.builtin.set_fact:
     os_images_elements_path: >
       {{ os_images_elements_path +
          [item.local ~ '/' ~ item.elements_path] }}
   with_items: "{{ os_images_git_elements }}"
   when: item.elements_path is defined
 
 - name: Set a fact containing the default DIB environment
-  set_fact:
+  ansible.builtin.set_fact:
     os_image_dib_env_default:
       ELEMENTS_PATH: "{{ os_images_elements_path | join(':') }}"
 
 - name: Generate diskimage-builder images
   vars:
     dib_args: >-
-      {% if item.size is defined %}--image-size {{ item.size }}{% endif %}
-      {% if item.type is defined %}-t {{ item.type }}{% endif %}
-      {% if item.packages | default %}-p {{ item.packages | join(',') }}{% endif %}
-      {{ os_images_common }}
-      {{ item.elements | join( ' ' ) }}
-      -o {{ item.name }}
-  shell: . {{ os_images_dib_venv }}/bin/activate && disk-image-create {{ dib_args }} > {{ item.name }}.stdout 2> {{ item.name }}.stderr
+      {% if item.size is defined %}--image-size {{ item.size }}{% endif %} {% if item.type is defined %}-t {{ item.type }}{% endif %} {% if item.packages | default
+      %}-p {{ item.packages | join(',') }}{% endif %} {{ os_images_common }} {{ item.elements | join(' ') }} -o {{ item.name }}
+  ansible.builtin.shell: . {{ os_images_dib_venv }}/bin/activate && disk-image-create {{ dib_args }} > {{ item.name }}.stdout 2> {{ item.name }}.stderr
   args:
     chdir: "{{ os_images_cache }}/{{ item.name }}"
     creates: "{{ os_images_cache }}/{{ item.name }}/{{ item.name }}.d/dib-manifests"
@@ -129,7 +124,7 @@
   when: item.elements is defined
 
 - name: Fail if any images failed to build
-  fail:
+  ansible.builtin.fail:
     msg: >
       Image {{ item.0.name }} failed to build. See
       {{ item.0.name }}.stdout and {{ item.0.name }}.stderr in

roles/os_images/tasks/main.yml

@@ -1,17 +1,17 @@
 ---
 - name: Set a fact about the Ansible python interpreter
-  set_fact:
+  ansible.builtin.set_fact:
     old_ansible_python_interpreter: "{{ ansible_python_interpreter | default('/usr/bin/python' + ansible_facts.python.version.major | string) }}"
 
-- import_tasks: images.yml
+- ansible.builtin.import_tasks: images.yml
   when: os_images_build | bool
 
-- import_tasks: upload.yml
+- ansible.builtin.import_tasks: upload.yml
   vars:
     ansible_python_interpreter: "{{ os_images_venv ~ '/bin/python' if os_images_venv != None else old_ansible_python_interpreter }}"
   when: os_images_upload | bool
 
-- import_tasks: promote.yml
+- ansible.builtin.import_tasks: promote.yml
   vars:
     ansible_python_interpreter: "{{ os_images_venv ~ '/bin/python' if os_images_venv != None else old_ansible_python_interpreter }}"
   when: os_images_promote | bool

roles/os_images/tasks/promote.yml

@@ -1,6 +1,6 @@
 ---
 - name: Check if image suffix is provided
-  fail:
+  ansible.builtin.fail:
     msg: os_images_name_suffix is empty please provide it.
   when: os_images_name_suffix is defined and os_images_name_suffix | length == 0
 
@@ -15,10 +15,10 @@
   when: item.rename_image | default(os_images_promote) | bool
 
 - name: Ensure images for retirement exist
-  assert:
+  ansible.builtin.assert:
     that:
       - item.name in retire_list.openstack_images | map(attribute='name') | list
-    fail_msg: The image {{ item.name[:-(os_images_name_suffix | length | int)] }} does not exist.
+    fail_msg: "The image {{ item.name[: -(os_images_name_suffix | length | int)] }} does not exist."
   loop: "{{ os_images_list | list }}"
   when: item.rename_image | default(os_images_promote) | bool
 
@@ -33,33 +33,33 @@
   when: item.rename_image | default(os_images_promote) | bool
 
 - name: Ensure images for promotion exist
-  assert:
+  ansible.builtin.assert:
     that:
       - item.name in promote_list.openstack_images | map(attribute='name') | list
     fail_msg: The image {{ item.name }} does not exist.
   loop: "{{ os_images_list | list }}"
   when: item.rename_image | default(os_images_promote) | bool
 
 - name: Hide retire candidate images
-  command: "{{ os_images_venv }}/bin/openstack image set --hidden {{ promotion_name }}"
+  ansible.builtin.command: "{{ os_images_venv }}/bin/openstack image set --hidden {{ promotion_name }}"
   vars:
-    promotion_name: "{{ item.name[:-(os_images_name_suffix | length | int)] }}"
+    promotion_name: "{{ item.name[: -(os_images_name_suffix | length | int)] }}"
   with_items: "{{ os_images_list | list }}"
   when: (item.rename_image | default(os_images_promote) | bool) and (item.hide_image | default(os_images_hide) | bool)
 
 - name: Ensure old images are retired
-  command: "{{ os_images_venv }}/bin/openstack image set {{ promotion_name }} --name {{ promotion_name }}.{{ date_suffix }}"
+  ansible.builtin.command: "{{ os_images_venv }}/bin/openstack image set {{ promotion_name }} --name {{ promotion_name }}.{{ date_suffix }}"
   vars:
     date_suffix: "{{ ansible_date_time.date }}"
-    promotion_name: "{{ item.name[:-(os_images_name_suffix | length | int)] }}"
+    promotion_name: "{{ item.name[: -(os_images_name_suffix | length | int)] }}"
   loop: "{{ os_images_list | list }}"
   when: item.rename_image | default(os_images_promote) | bool
   environment: "{{ os_images_venv }}"
 
 - name: Ensure new images are promoted
-  command: "{{ os_images_venv }}/bin/openstack image set {{ item.name }} --name {{ promotion_name }}"
+  ansible.builtin.command: "{{ os_images_venv }}/bin/openstack image set {{ item.name }} --name {{ promotion_name }}"
   vars:
-    promotion_name: "{{ item.name[:-(os_images_name_suffix | length | int)] }}"
+    promotion_name: "{{ item.name[: -(os_images_name_suffix | length | int)] }}"
   loop: "{{ os_images_list | list }}"
   when: item.rename_image | default(os_images_promote) | bool
   environment: "{{ os_images_venv }}"

roles/os_images/tasks/upload.yml

@@ -1,6 +1,6 @@
 ---
 - name: Ensure existing cloud tenant kernel does not exist
-  os_image:
+  openstack.cloud.image:
     auth_type: "{{ os_images_auth_type }}"
     auth: "{{ os_images_auth }}"
     cacert: "{{ os_images_cacert | default(omit) }}"
@@ -18,7 +18,7 @@
   tags: clean
 
 - name: Upload cloud tenant kernel for baremetal images
-  os_image:
+  openstack.cloud.image:
     auth_type: "{{ os_images_auth_type }}"
     auth: "{{ os_images_auth }}"
     cacert: "{{ os_images_cacert | default(omit) }}"
@@ -39,7 +39,7 @@
   register: kernel_result
 
 - name: Ensure existing cloud tenant ramdisk does not exist
-  os_image:
+  openstack.cloud.image:
     auth_type: "{{ os_images_auth_type }}"
     auth: "{{ os_images_auth }}"
     cacert: "{{ os_images_cacert | default(omit) }}"
@@ -57,7 +57,7 @@
   tags: clean
 
 - name: Upload cloud tenant ramdisk for baremetal images
-  os_image:
+  openstack.cloud.image:
     auth_type: "{{ os_images_auth_type }}"
     auth: "{{ os_images_auth }}"
     cacert: "{{ os_images_cacert | default(omit) }}"
@@ -78,7 +78,7 @@
   register: ramdisk_result
 
 - name: Ensure existing cloud tenant image does not exist
-  os_image:
+  openstack.cloud.image:
     auth_type: "{{ os_images_auth_type }}"
     auth: "{{ os_images_auth }}"
     cacert: "{{ os_images_cacert | default(omit) }}"
@@ -93,7 +93,7 @@
   tags: clean
 
 - name: Upload cloud tenant images
-  os_image:
+  openstack.cloud.image:
     auth_type: "{{ os_images_auth_type }}"
     auth: "{{ os_images_auth }}"
     cacert: "{{ os_images_cacert | default(omit) }}"