Merge pull request #389 from luis5tb/logrotate

Ensure logrotate image is also pre-downloaded
openstack-k8s-operators · Oct 5, 2023 · 19ed55e · 19ed55e
2 parents c549151 + 15d971d
commit 19ed55e
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 4 deletions.
diff --git a/roles/edpm_download_cache/tasks/container_images.yml b/roles/edpm_download_cache/tasks/container_images.yml
@@ -76,3 +76,11 @@
   ansible.builtin.include_role:
     name: osp.edpm.edpm_neutron_dhcp
     tasks_from: download_cache.yml
+
+- name: Download images for edpm_logrotate_crond role
+  ansible.builtin.include_role:
+    name: osp.edpm.edpm_logrotate_crond
+    tasks_from: download_cache_images.yml
+  tags:
+    - edpm_logrotate_crond
+    - download_cache
diff --git a/roles/edpm_download_cache/tasks/packages.yml b/roles/edpm_download_cache/tasks/packages.yml
@@ -43,7 +43,7 @@
 - name: Download packages for edpm_logrotate_crond role
   ansible.builtin.include_role:
     name: osp.edpm.edpm_logrotate_crond
-    tasks_from: download_cache.yml
+    tasks_from: download_cache_packages.yml
   tags:
     - edpm_logrotate_crond
     - download_cache

diff --git a/roles/edpm_logrotate_crond/tasks/download_cache_images.yml b/roles/edpm_logrotate_crond/tasks/download_cache_images.yml
@@ -0,0 +1,10 @@
+---
+
+- name: Download needed container images
+  containers.podman.podman_image:
+    name: "{{ edpm_logrotate_crond_image }}"
+  become: true
+  register: edpm_logrotate_crond_cronie_images_download
+  until: edpm_logrotate_crond_cronie_images_download.failed == false
+  retries: "{{ edpm_logrotate_crond_download_retries }}"
+  delay: "{{ edpm_logrotate_crond_download_delay }}"
diff --git a/..._logrotate_crond/tasks/download_cache.yml → ...e_crond/tasks/download_cache_packages.yml b/..._logrotate_crond/tasks/download_cache.yml → ...e_crond/tasks/download_cache_packages.yml
diff --git a/roles/edpm_ovn_bgp_agent/tasks/download_cache.yml b/roles/edpm_ovn_bgp_agent/tasks/download_cache.yml
@@ -2,9 +2,7 @@
 
 - name: Download needed container images
   containers.podman.podman_image:
-    name: "{{ item }}"
-  loop:
-    - "{{ edpm_ovn_bgp_agent_image }}"
+    name: "{{ edpm_ovn_bgp_agent_image }}"
   become: true
   register: edpm_ovn_bgp_agent_images_download
   until: edpm_ovn_bgp_agent_images_download.failed == false