Merge pull request #329 from rebtoor/download-cache-edpm-podman

Enable download-cache support in `edpm_podman` role

roles/edpm_download_cache/tasks/main.yml

@@ -20,6 +20,11 @@
     name: osp.edpm.edpm_bootstrap
     tasks_from: download_cache.yml
 
+- name: Download packages for edpm_podman role
+  ansible.builtin.include_role:
+    name: osp.edpm.edpm_podman
+    tasks_from: download_cache.yml
+
 - name: Download packages for edpm_tuned role
   ansible.builtin.include_role:
     name: osp.edpm.edpm_tuned

roles/edpm_podman/defaults/main.yml

@@ -16,6 +16,14 @@
 
 
 # All variables intended for modification should be placed in this file.
+
+
+# seconds between retries for download tasks
+edpm_podman_download_delay: 5
+
+# number of retries for download tasks
+edpm_podman_download_retries: 5
+
 edpm_podman_hide_sensitive_logs: "{{ hide_sensitive_logs | default(true) }}"
 
 edpm_podman_buildah_login: false

roles/edpm_podman/handlers/main.yml

@@ -1,5 +1,5 @@
 ---
 - name: Restart rsyslog
-  systemd:
+  ansible.builtin.systemd:
     name: rsyslog
     state: restarted

roles/edpm_podman/meta/argument_specs.yml

@@ -4,6 +4,14 @@ argument_specs:
   main:
     short_description: The main entry point for the edpm_podman role.
     options:
+      edpm_podman_download_delay:
+        type: int
+        default: 5
+        description: The seconds between retries for failed download tasks
+      edpm_podman_download_retries:
+        type: int
+        default: 5
+        description: The number of retries for failed download tasks
       edpm_podman_hide_sensitive_logs:
         type: bool
         default: true

roles/edpm_podman/tasks/buildah_login.yml

@@ -14,23 +14,15 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-- name: Gather variables for each operating system for installing buildah
-  ansible.builtin.include_vars: "{{ item }}"
-  with_first_found:
-    - skip: true
-      files:
-        - "{{ ansible_facts['distribution'] | lower }}-{{ ansible_facts['distribution_version'] | lower }}.yml"
-        - "{{ ansible_facts['distribution'] | lower }}-{{ ansible_facts['distribution_major_version'] | lower }}.yml"
-        - "{{ ansible_facts['os_family'] | lower }}-{{ ansible_facts['distribution_major_version'] | lower }}.yml"
-        - "{{ ansible_facts['distribution'] | lower }}.yml"
-        - "{{ ansible_facts['os_family'] | lower }}-{{ ansible_facts['distribution_version'].split('.')[0] }}.yml"
-        - "{{ ansible_facts['os_family'] | lower }}.yml"
-
 - name: Ensure buildah is installed
   become: true
-  ansible.builtin.package:
+  ansible.builtin.dnf:
     name: "{{ edpm_buildah_package }}"
     state: present
+  register: edpm_buildah_package_download
+  until: edpm_buildah_package_download.rc == 0
+  retries: "{{ edpm_podman_download_retries }}"
+  delay: "{{ edpm_podman_download_delay }}"
 
 - name: Perform container registry login(s) with buildah
   become: true

roles/edpm_podman/tasks/configure.yml

@@ -19,7 +19,7 @@
 - name: Configure edpm_container_manage to generate systemd drop-in dependencies
   ansible.builtin.copy:
     dest: /etc/sysconfig/podman_drop_in
-    mode: 0644
+    mode: '0644'
     content: |
       This file makes edpm_container_manage generate additional systemd
       dependencies for containers that have special

roles/edpm_podman/tasks/download_cache.yml

@@ -0,0 +1,13 @@
+---
+
+- name: Download needed packages
+  ansible.builtin.dnf:
+    name:
+      - "{{ edpm_podman_package }}"
+      - "{{ edpm_buildah_package }}"
+    download_only: true
+  become: true
+  register: edpm_podman_packages_download
+  until: edpm_podman_packages_download.rc == 0
+  retries: "{{ edpm_podman_download_retries }}"
+  delay: "{{ edpm_podman_download_delay }}"

roles/edpm_podman/tasks/install.yml

@@ -14,17 +14,17 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-- name: Load vars id needed
-  when: edpm_podman_packages is undefined or edpm_podman_packages | length == 0
-  ansible.builtin.import_tasks: load_vars.yaml
-
 - name: Install block
   become: true
   block:
     - name: Ensure podman and deps are installed
-      ansible.builtin.package:
+      ansible.builtin.dnf:
         name: "{{ edpm_podman_package }}"
         state: present
+      register: edpm_podman_package_download
+      until: edpm_podman_package_download.rc == 0
+      retries: "{{ edpm_podman_download_retries }}"
+      delay: "{{ edpm_podman_download_delay }}"
 
     - name: Ensure we get the ansible interfaces facts
       when:
@@ -53,7 +53,7 @@
             path: /etc/cni/net.d
             state: directory
             recurse: true
-            mode: 0755
+            mode: '0755'
             owner: root
             group: root
 
@@ -74,7 +74,7 @@
             path: /etc/containers/networks
             state: directory
             recurse: true
-            mode: 0755
+            mode: '0755'
             owner: root
             group: root
         - name: Get current podman network

roles/edpm_podman/tasks/main.yml

@@ -14,9 +14,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-- name: Load vars
-  ansible.builtin.import_tasks: load_vars.yaml
-
 - name: Podman install
   ansible.builtin.import_tasks: install.yml
 

roles/edpm_podman/tasks/rsyslog.yml

@@ -39,7 +39,7 @@
       register: logconfig
 
     - name: Restart rsyslog service after logging conf change
-      ansible.builtin.service:
+      ansible.builtin.systemd:
         name: rsyslog
         state: restarted
       when: logconfig is changed

roles/edpm_podman/tasks/service.yml

@@ -19,17 +19,18 @@
   ansible.builtin.file:
     path: "{{ edpm_podman_socket_path | dirname }}"
     state: directory
-    mode: 0755
+    mode: '0755'
 
 - name: Create required systemd unit file for podman service
   become: true
   ansible.builtin.template:
     src: podman.service.j2
     dest: "/etc/systemd/system/{{ edpm_podman_service_unit_name }}"
-    mode: 0644
+    mode: '0644'
 
 - name: Enable podman service unit
-  ansible.builtin.service:
+  become: true
+  ansible.builtin.systemd:
     name: "{{ edpm_podman_service_unit_name }}"
     state: started
     enabled: true