more linting

Author: scrungus

roles/os_images/defaults/main.yml

@@ -21,7 +21,7 @@ os_images_upper_constraints_file: https://releases.openstack.org/constraints/upp
 os_images_dib_upper_constraints_file: ""
 
 # Path to a directory in which to cache build artefacts.
-os_images_cache: "{{ lookup('env','HOME') }}/disk_images"
+os_images_cache: "{{ lookup('env', 'HOME') }}/disk_images"
 
 # List of paths of site-specific diskimage-builder elements
 # os_images_elements: [ "{{ playbook_dir }}/stackhpc-image-elements" ]
@@ -58,11 +58,11 @@ os_images_auth_type: password
 
 # OpenStack authentication credentials:
 # For example, take OpenStack authentication credentials from the environment
-#os_images_auth:
-#  auth_url:     "{{ lookup('env','OS_AUTH_URL') }}"
-#  username:     "{{ lookup('env','OS_USERNAME') }}"
-#  password:     "{{ lookup('env','OS_PASSWORD') }}"
-#  project_name: "{{ lookup('env','OS_TENANT_NAME') }}"
+# os_images_auth:
+#   auth_url:     "{{ lookup('env','OS_AUTH_URL') }}"
+#   username:     "{{ lookup('env','OS_USERNAME') }}"
+#   password:     "{{ lookup('env','OS_PASSWORD') }}"
+#   project_name: "{{ lookup('env','OS_TENANT_NAME') }}"
 os_images_auth:
 # Endpoint URL type to fetch from the service catalog. Maybe be one of:
 # public, admin, or internal.

roles/os_images/meta/main.yml

@@ -1,16 +1,15 @@
 ---
 galaxy_info:
-  #role_name: os_images
   author: Stig Telfer
   description: >
     Role to generate guest instance images and upload to OpenStack
   company: StackHPC Ltd
   license: Apache2
-  min_ansible_version: 2.0
+  min_ansible_version: "2.0"
   platforms:
     - name: EL
       versions:
-        - 7
+        - "7"
     - name: Ubuntu
       versions:
         - all

roles/os_images/tasks/images.yml

@@ -26,6 +26,7 @@
     owner: "{{ ansible_facts.user_uid }}"
     group: "{{ ansible_facts.user_gid }}"
     state: directory
+    mode: "0644"
   become: true
 
 - name: Remove old images for force rebuild
@@ -44,12 +45,14 @@
     owner: "{{ ansible_facts.user_uid }}"
     group: "{{ ansible_facts.user_gid }}"
     state: directory
+    mode: "0644"
   with_items: "{{ os_images_list | list }}"
   loop_control:
     label: "{{ item.name }}"
   become: true
 
-- vars:
+- name: Download and unpack
+  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
@@ -60,15 +63,18 @@
         url: "{{ item.image_url }}"
         dest: "{{ image_dest }}"
         checksum: "{{ item.checksum | default(omit) }}"
+        mode: "0644"
       with_items: "{{ os_images_list | list }}"
       loop_control:
         label: "{{ item.name }}"
     - name: Unpack the image if .xz format
       ansible.builtin.command: unxz --keep --force {{ image_dest }}
+      changed_when: true
       when: image_is_xz
       with_items: "{{ os_images_list | list }}"
       loop_control:
         label: "{{ item.name }}"
+
 - name: Install a suitable version of diskimage-builder
   ansible.builtin.pip:
     name: "{{ item.name }}"

roles/os_images/tasks/main.yml

@@ -3,15 +3,18 @@
   ansible.builtin.set_fact:
     old_ansible_python_interpreter: "{{ ansible_python_interpreter | default('/usr/bin/python' + ansible_facts.python.version.major | string) }}"
 
-- ansible.builtin.import_tasks: images.yml
+- name: Build or download images
+  ansible.builtin.import_tasks: images.yml
   when: os_images_build | bool
 
-- ansible.builtin.import_tasks: upload.yml
+- name: Upload images
+  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
 
-- ansible.builtin.import_tasks: promote.yml
+- name: Promote or hide/retire images
+  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

@@ -45,6 +45,7 @@
   vars:
     promotion_name: "{{ item.name[: -(os_images_name_suffix | length | int)] }}"
   with_items: "{{ os_images_list | list }}"
+  changed_when: true
   when: (item.rename_image | default(os_images_promote) | bool) and (item.hide_image | default(os_images_hide) | bool)
 
 - name: Ensure old images are retired
@@ -54,12 +55,14 @@
     promotion_name: "{{ item.name[: -(os_images_name_suffix | length | int)] }}"
   loop: "{{ os_images_list | list }}"
   when: item.rename_image | default(os_images_promote) | bool
+  changed_when: true
   environment: "{{ os_images_venv }}"
 
 - name: Ensure new images are promoted
   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)] }}"
   loop: "{{ os_images_list | list }}"
+  changed_when: true
   when: item.rename_image | default(os_images_promote) | bool
   environment: "{{ os_images_venv }}"

roles/os_images/tests/test.yml

@@ -1,5 +1,6 @@
 ---
-- hosts: all
+- name: Os_images
+  hosts: all
   connection: local
   roles:
     - stackhpc.openstack.os_images