Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Enable download-cache support in edpm_iscsid role" #352

Merged
merged 1 commit into from
Sep 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions roles/edpm_download_cache/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 0 additions & 6 deletions roles/edpm_iscsid/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 0 additions & 8 deletions roles/edpm_iscsid/meta/argument_specs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 0 additions & 10 deletions roles/edpm_iscsid/tasks/download_cache.yml

This file was deleted.