Test after ansible-lint

Author: seunghun1ee

etc/kayobe/ansible/octavia-amphora-image-build.yml

@@ -6,7 +6,7 @@
     amphora_image_dest: "{{ image_cache_path }}/amphora-x64-haproxy-{{ openstack_release }}.qcow2"
   tasks:
     - name: Install EPEL
-      package:
+      ansible.builtin.package:
         name: epel-release
       become: true
       when:
@@ -29,24 +29,25 @@
           Debian:
             - qemu-utils
             - kpartx
-      package:
+      ansible.builtin.package:
         name: "{{ packages_common + packages_for_os_family[ansible_facts.os_family] }}"
 
     - name: Create a temporary directory
-      tempfile:
+      ansible.builtin.tempfile:
         state: directory
       register: tempfile_result
 
-    - block:
+    - name: Build Amphora image
+      block:
         - name: Check whether the image cache directory exists
-          stat:
+          ansible.builtin.stat:
             path: "{{ image_cache_path }}"
-            get_checksum: False
-            mime: False
+            get_checksum: false
+            mime: false
           register: image_cache_stat
 
         - name: Ensure the image cache directory exists
-          file:
+          ansible.builtin.file:
             path: "{{ image_cache_path }}"
             state: directory
             owner: "{{ ansible_facts.user_uid }}"
@@ -59,46 +60,48 @@
         - name: Set path facts
           vars:
             work_path: "{{ tempfile_result.path }}"
-          set_fact:
+          ansible.builtin.set_fact:
             src_path: "{{ work_path }}/octavia"
             venv_path: "{{ work_path }}/venv"
             work_path: "{{ work_path }}"
 
         - name: Clone Octavia source code
-          git:
+          ansible.builtin.git:
             depth: 1
             dest: "{{ src_path }}"
-            repo: "https://opendev.org/openstack/octavia"
+            repo: https://opendev.org/openstack/octavia
             version: "{{ openstack_branch }}"
 
         - name: Install diskimage-builder in a virtual environment
-          pip:
+          ansible.builtin.pip:
             name: diskimage-builder
             extra_args: "{% if amphora_dib_upper_constraints_file %}-c {{ amphora_dib_upper_constraints_file }}{% endif %}"
             virtualenv: "{{ venv_path }}"
-            virtualenv_command: "python3.{{ ansible_facts.python.version.minor }} -m venv"
+            virtualenv_command: python3.{{ ansible_facts.python.version.minor }} -m venv
 
         - name: Create build log file (/var/log/octavia-amphora-image-build.log)
-          file:
+          ansible.builtin.file:
             path: /var/log/octavia-amphora-image-build.log
             state: touch
             owner: "{{ ansible_facts.user_uid }}"
             group: "{{ ansible_facts.user_gid }}"
           become: true
 
         - name: Create the Amphora image
-          shell:
-            cmd: ". {{ venv_path }}/bin/activate && ./diskimage-create.sh -i ubuntu-minimal -s 3 -g {{ openstack_branch }} >> /var/log/octavia-amphora-image-build.log 2>&1"
+          ansible.builtin.shell:
+            cmd: >-
+              source {{ venv_path }}/bin/activate &&
+              ./diskimage-create.sh -i ubuntu-minimal -s 3 -g {{ openstack_branch }} >> /var/log/octavia-amphora-image-build.log 2>&1
             chdir: "{{ src_path }}/diskimage-create"
           changed_when: true
 
         - name: Copy image to image store
-          copy:
+          ansible.builtin.copy:
             src: "{{ src_path }}/diskimage-create/amphora-x64-haproxy.qcow2"
             dest: "{{ amphora_image_dest }}"
             remote_src: true
       always:
         - name: Remove temporary files
-          file:
+          ansible.builtin.file:
             path: "{{ work_path }}"
             state: absent

etc/kayobe/ansible/octavia-amphora-image-register.yml

@@ -1,86 +1,118 @@
 ---
-- name: Register an Octavia Amphora image in Glance
+- name: Octavia credentials precheck
   gather_facts: yes
-  hosts: "{{ amphora_builder_group | default('seed') }}"
-  vars:
-    venv: "{{ virtualenv_path }}/octavia-amphora"
+  hosts: localhost
   tasks:
     - name: Fail if not using octavia user and service project
-      fail:
+      ansible.builtin.fail:
         msg: >-
           Source the octavia-openrc.sh file before executing this playbook
       when: >-
         lookup('env', 'OS_USERNAME') != 'octavia' or
         lookup('env', 'OS_PROJECT_NAME') != 'service'
 
+- name: Download Amphora image from Ark
+  ansible.builtin.import_playbook: pulp-amphora-image-download.yml
+  when: download_from_ark | default(true) | bool
+
+- name: Register an Octavia Amphora image in Glance
+  gather_facts: yes
+  hosts: localhost
+  vars:
+    venv: "{{ virtualenv_path }}/octavia-amphora"
+    image_path: "/tmp/amphora-x64-haproxy.qcow2"
+  tasks:
     - name: Get image checksum
-      stat:
-        path: "{{ image_cache_path }}/amphora-x64-haproxy-{{ openstack_release }}.qcow2"
+      vars:
+        ansible_host: "{{ hostvars[groups['controllers'][0]].ansible_host }}"
+      ansible.builtin.stat:
+        path: "{{ image_path }}"
         checksum_algorithm: md5
       changed_when: false
       register: image_checksum
+      delegate_to: "{{ groups['controllers'][0] }}"
+      become: true
 
     - name: Assert that Amphora image exists
-      assert:
+      vars:
+        ansible_host: "{{ hostvars[groups['controllers'][0]].ansible_host }}"
+      ansible.builtin.assert:
         that: image_checksum.stat.exists
         fail_msg: |
-          The amphora image: {{ image_cache_path }}/amphora-x64-haproxy-{{ openstack_release }}.qcow2
-          does not exist. Did you build the image?
+          The amphora image: {{ image_path }}
+          does not exist. Did you download or build the image?
+      delegate_to: "{{ groups['controllers'][0] }}"
+
+    - name: Ensure packages for python-openstackclient are installed
+      become: true
+      vars:
+        required_packages:
+          - python3-venv
+          - python3-dev
+          - gcc
+        ansible_host: "{{ hostvars[groups['controllers'][0]].ansible_host }}"
+      ansible.builtin.package:
+        name: "{{ required_packages }}"
+      delegate_to: "{{ groups['controllers'][0] }}"
 
     - name: Set up openstack virtualenv
-      pip:
+      vars:
+        ansible_host: "{{ hostvars[groups['controllers'][0]].ansible_host }}"
+      ansible.builtin.pip:
         virtualenv: "{{ venv }}"
         virtualenv_command: python3 -m venv
         name:
           - openstacksdk
           - python-openstackclient
         state: latest
         extra_args: "{% if openstacksdk_upper_constraints_file %}-c {{ openstacksdk_upper_constraints_file }}{% endif %}"
+      delegate_to: "{{ groups['controllers'][0] }}"
 
     - name: Query Octavia Amphora image
       vars:
         ansible_python_interpreter: "{{ venv }}/bin/python"
-      os_image_info:
+        ansible_host: "{{ hostvars[groups['controllers'][0]].ansible_host }}"
+      openstack.cloud.image_info:
         auth_type: password
         auth: "{{ openstack_auth }}"
         ca_cert: "{{ openstack_cacert }}"
         interface: "{{ openstack_interface }}"
         image: amphora-x64-haproxy
       register: image_info
+      delegate_to: "{{ groups['controllers'][0] }}"
 
-    - name: Ensure Octavia Amphora image is renamed
+    - name: Ensure old Octavia Amphora image is renamed
       vars:
         ansible_python_interpreter: "{{ venv }}/bin/python"
-      shell:
+        ansible_host: "{{ hostvars[groups['controllers'][0]].ansible_host }}"
+      ansible.builtin.command:
         cmd: >-
           {{ venv }}/bin/openstack image set amphora-x64-haproxy --name amphora-x64-haproxy-{{ ansible_facts.date_time.iso8601_basic_short }}
       when:
-        - image_info.image
-        - image_info.image.checksum != image_checksum.stat.checksum
+        - image_info.images | length != 0
+        - image_info.images[0].checksum != image_checksum.stat.checksum
       changed_when: true
       environment: "{{ openstack_auth_env }}"
+      delegate_to: "{{ groups['controllers'][0] }}"
 
-    - name: Ensure Octavia Amphora image is registered
+    - name: Ensure new Octavia Amphora image is registered
       vars:
         ansible_python_interpreter: "{{ venv }}/bin/python"
-      os_image:
+        ansible_host: "{{ hostvars[groups['controllers'][0]].ansible_host }}"
+      openstack.cloud.image:
         auth_type: password
         auth: "{{ openstack_auth }}"
         ca_cert: "{{ openstack_cacert }}"
         interface: "{{ openstack_interface }}"
         name: amphora-x64-haproxy
+        tags: ["amphora"]
         container_format: bare
         disk_format: qcow2
-        is_public: no
-        filename: "{{ image_cache_path }}/amphora-x64-haproxy-{{ openstack_release }}.qcow2"
+        is_public: false
+        filename: "{{ image_path }}"
         properties:
           hw_architecture: x86_64
           hw_rng_model: virtio
-
-    # FIXME: Use 'tags' parameter of os_image module available from
-    # openstack.cloud.image 1.5.0.
-    - name: Ensure Octavia Amphora image is tagged
-      shell:
-        cmd: >-
-          {{ venv }}/bin/openstack image set amphora-x64-haproxy --tag amphora
-      environment: "{{ openstack_auth_env }}"
+      when: image_info.images | length == 0 or (image_info.images | length != 0 and image_info.images[0].checksum != image_checksum.stat.checksum)
+      become: true
+      delegate_to: "{{ groups['controllers'][0] }}"