diff --git a/roles/edpm_download_cache/tasks/main.yml b/roles/edpm_download_cache/tasks/main.yml index ae06422f1..10b645fa9 100644 --- a/roles/edpm_download_cache/tasks/main.yml +++ b/roles/edpm_download_cache/tasks/main.yml @@ -54,8 +54,3 @@ ansible.builtin.include_role: name: osp.edpm.edpm_sshd tasks_from: download_cache.yml - -- name: Download images for edpm_iscsid role - ansible.builtin.include_role: - name: osp.edpm.edpm_iscsid - tasks_from: download_cache.yml diff --git a/roles/edpm_iscsid/defaults/main.yml b/roles/edpm_iscsid/defaults/main.yml index 629e9f914..c3e1fdea8 100644 --- a/roles/edpm_iscsid/defaults/main.yml +++ b/roles/edpm_iscsid/defaults/main.yml @@ -20,12 +20,6 @@ # All variables within this role should have a prefix of "edpm_iscsid" edpm_iscsid_debug: "{{ (ansible_verbosity | int) >= 2 | bool }}" -# seconds between retries for download tasks -edpm_iscsid_image_download_delay: 5 - -# number of retries for download tasks -edpm_iscsid_image_download_retries: 5 - edpm_iscsid_image: "quay.io/podified-antelope-centos9/openstack-iscsid:current-podified" edpm_iscsid_volumes: - /var/lib/kolla/config_files/iscsid.json:/var/lib/kolla/config_files/config.json:ro diff --git a/roles/edpm_iscsid/meta/argument_specs.yml b/roles/edpm_iscsid/meta/argument_specs.yml index 8670e7913..b1fb7b315 100644 --- a/roles/edpm_iscsid/meta/argument_specs.yml +++ b/roles/edpm_iscsid/meta/argument_specs.yml @@ -4,14 +4,6 @@ argument_specs: main: short_description: The main entry point for the edpm_iscsid role. options: - edpm_iscsid_image_download_delay: - type: int - default: 5 - description: The seconds between retries for failed download tasks - edpm_iscsid_image_download_retries: - type: int - default: 5 - description: The number of retries for failed download tasks edpm_iscsid_debug: type: bool default: false diff --git a/roles/edpm_iscsid/tasks/download_cache.yml b/roles/edpm_iscsid/tasks/download_cache.yml deleted file mode 100644 index 9c2bc5189..000000000 --- a/roles/edpm_iscsid/tasks/download_cache.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Download needed container - containers.podman.podman_image: - name: "{{ edpm_iscsid_image }}" - become: true - register: edpm_iscsid_image_download - until: edpm_iscsid_image_download.failed == false - retries: "{{ edpm_iscsid_image_download_retries }}" - delay: "{{ edpm_iscsid_image_download_delay }}"