Apply suggestions from code review

Co-authored-by: Mark Goddard <[email protected]>

Author: scrungus

roles/os_images/README.md

@@ -2,7 +2,7 @@ OpenStack Images
 ================
 
 This role generates guest instance images using disk-image-builder
-and uploads them to OpenStack using the `os_image` module.
+and uploads them to OpenStack using the `openstack.cloud.image` module.
 
 Requirements
 ------------
@@ -121,9 +121,9 @@ The following playbook generates a guest image and uploads it to OpenStack:
 
     ---
     - name: Generate guest image and upload
-      hosts: openstack
+      hosts: localhost
       roles:
-        - role: stackhpc.os-images
+        - role: stackhpc.openstack.os_images
           os_images_auth:
             auth_url:     "{{ lookup('env','OS_AUTH_URL') }}"
             username:     "{{ lookup('env','OS_USERNAME') }}"

roles/os_images/defaults/main.yml

@@ -12,10 +12,8 @@ os_images_package_state: present
 # Upper constraints file for installation of python dependencies to upload
 # images.
 #
-# Use Train upper constraints when running with Python 2, to avoid
-# incompatibility with newer OSC releases. Use Yoga upper constraints
-# otherwise, to avoid incompatibility with openstacksdk 0.99.0.
-os_images_upper_constraints_file: https://releases.openstack.org/constraints/upper/{% if ansible_facts.python.version.major == 2 %}train{% else %}yoga{% endif %}
+# Use Yoga upper constraints to avoid incompatibility with openstacksdk 0.99.0.
+os_images_upper_constraints_file: https://releases.openstack.org/constraints/upper/yoga
 
 # Upper constraints file for installation of DIB to build images.
 os_images_dib_upper_constraints_file: ""

roles/os_images/tasks/images.yml

@@ -10,7 +10,7 @@
 # The rpm-distro element executes 'semanage' during its cleanup phase.
 - 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_name: "python3-policycoreutils"
   ansible.builtin.package:
     name: "{{ package_name }}"
     state: present
@@ -26,7 +26,7 @@
     owner: "{{ ansible_facts.user_uid }}"
     group: "{{ ansible_facts.user_gid }}"
     state: directory
-    mode: "0644"
+    mode: "0755"
   become: true
 
 - name: Remove old images for force rebuild
@@ -45,7 +45,7 @@
     owner: "{{ ansible_facts.user_uid }}"
     group: "{{ ansible_facts.user_gid }}"
     state: directory
-    mode: "0644"
+    mode: "0755"
   with_items: "{{ os_images_list | list }}"
   loop_control:
     label: "{{ item.name }}"

roles/os_images/tasks/main.yml

@@ -1,7 +1,7 @@
 ---
 - name: Set a fact about the Ansible python interpreter
   ansible.builtin.set_fact:
-    old_ansible_python_interpreter: "{{ ansible_python_interpreter | default('/usr/bin/python' + ansible_facts.python.version.major | string) }}"
+    old_ansible_python_interpreter: "{{ ansible_python_interpreter | default('/usr/bin/python3') }}"
 
 - name: Build or download images
   ansible.builtin.import_tasks: images.yml

roles/os_images/tasks/promote.yml

@@ -35,7 +35,7 @@
 - name: Ensure images for promotion exist
   ansible.builtin.assert:
     that:
-      - item.name in promote_list.openstack_images | map(attribute='name') | list
+      - item.name in promote_list.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