Modernize playbooks

Author: mdellweg

templates/github/.ci/ansible/build_container.yaml

@@ -1,6 +1,7 @@
 # Ansible playbook to create the pulp service containers image
 ---
-- hosts: "localhost"
+- name: "Build CI Container Image"
+  hosts: "localhost"
   gather_facts: false
   vars_files:
     - "vars/main.yaml"
@@ -9,6 +10,7 @@
       ansible.builtin.template:
         src: "Containerfile.j2"
         dest: "Containerfile"
+
     - name: "Build pulp image"
       # We build from the ../.. (parent dir of pulpcore git repo) Docker build
       # "context" so that repos like pulp-smash are accessible to Docker
@@ -18,9 +20,20 @@
       # 1-off-builds and CI purposes (which has no cache across CI runs.)
       # Run build.yaml with -e cache=false if your builds are using outdated
       # layers.
-      command: "docker build --network host --no-cache={{ not cache | default(true) | bool }} -t {{ image.name }}:{{ image.tag }} -f {{ playbook_dir }}/Containerfile ../../.."
+      ansible.builtin.command:
+        argv:
+          - "docker"
+          - "build"
+          - "--network"
+          - "host"
+          - "--no-cache={{ not cache | default(true) | bool }}"
+          - "-t"
+          - "{{ image.name }}:{{ image.tag }}"
+          - "-f"
+          - "{{ playbook_dir }}/Containerfile"
+          - "../../.."
 
     - name: "Clean image cache"
-      docker_prune:
-        images : true
+      community.docker.docker_prune:
+        images: true
 ...

templates/github/.ci/ansible/start_container.yaml

@@ -1,6 +1,7 @@
 # Ansible playbook to start the pulp service container and its supporting services
 ---
-- hosts: "localhost"
+- name: "Start CI Containers"
+  hosts: "localhost"
   gather_facts: false
   vars_files:
     - "vars/main.yaml"
@@ -14,16 +15,16 @@
         - "settings"
 
     - name: "Generate Pulp Settings"
-      template:
+      ansible.builtin.template:
         src: "settings.py.j2"
         dest: "settings/settings.py"
 
     - name: "Setup docker networking"
-      docker_network:
+      community.docker.docker_network:
         name: "pulp_ci_bridge"
 
     - name: "Start Service Containers"
-      docker_container:
+      community.docker.docker_container:
         name: "{{ item.name }}"
         image: "{{ item.image }}"
         auto_remove: true
@@ -39,12 +40,12 @@
       loop: "{{ services | default([]) }}"
 
     - name: "Retrieve Docker Network Info"
-      docker_network_info:
+      community.docker.docker_network_info:
         name: "pulp_ci_bridge"
       register: "pulp_ci_bridge_info"
 
     - name: "Update /etc/hosts"
-      lineinfile:
+      ansible.builtin.lineinfile:
         path: "/etc/hosts"
         regexp: "\\s{{ item.value.Name }}\\s*$"
         line: "{{ item.value.IPv4Address | ansible.utils.ipaddr('address') }}\t{{ item.value.Name }}"
@@ -61,7 +62,8 @@
         state: "present"
       when: "s3_test | default(false)"
 
-    - block:
+    - name: "Wait on Services"
+      block:
         - name: "Wait for azurite"
           ansible.builtin.uri:
             url: "http://ci-azurite:10000/"
@@ -83,11 +85,12 @@
           delay: 5
       rescue:
         - name: "Output pulp container log"
-          command: "docker logs pulp"
+          ansible.builtin.command:
+            cmd: "docker logs pulp"
           failed_when: true
 
     - name: "Check version of component being tested"
-      assert:
+      ansible.builtin.assert:
         that:
           - "(result.json.versions | items2dict(key_name='component', value_name='version'))[item.app_label] | canonical_semver == (component_version | canonical_semver)"
         fail_msg: |
@@ -96,14 +99,15 @@
       loop: "{{ 'plugins' | ansible.builtin.extract(lookup('ansible.builtin.file', '../../template_config.yml') | from_yaml) }}"
 
     - name: "Set pulp password in .netrc"
-      copy:
+      ansible.builtin.copy:
         dest: "~/.netrc"
         content: |
           machine pulp
           login admin
           password password
 
-- hosts: "pulp"
+- name: "Prepare Pulp Application Container"
+  hosts: "pulp"
   gather_facts: false
   tasks:
     - name: "Create directory for pulp-smash config"
@@ -118,6 +122,6 @@
         dest: "/var/lib/pulp/.config/pulp_smash/settings.json"
 
     - name: "Set pulp admin password"
-      command:
+      ansible.builtin.command:
         cmd: "pulpcore-manager reset-admin-password --password password"
 ...