From 12e62b198fee736c84c3c9f8f0d21feb7a0b0c68 Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 8 Nov 2018 12:53:42 +0100 Subject: [PATCH] Extend rate limiting capabilities of URL fetching tasks --- roles/autorunner/tasks/install.yml | 4 +-- roles/clipmenu/tasks/install.yml | 4 +-- roles/dbeaver/tasks/install.yml | 4 +-- roles/diff-highlight/tasks/install.yml | 4 +-- roles/docker-compose/tasks/install.yml | 25 ------------------- roles/ffscreencast/tasks/install.yml | 4 +-- roles/font-droid-sans-mono/tasks/install.yml | 4 +-- roles/font-font-awesome/tasks/install.yml | 4 +-- roles/font-san-francisco/tasks/install.yml | 4 +-- roles/font-terminus/tasks/install.yml | 4 +-- roles/i3-utils-bin/tasks/install.yml | 8 +++--- roles/i3-utils-systemd/tasks/install.yml | 12 ++++----- roles/kops/tasks/install.yml | 8 +++--- roles/kubectl/tasks/install.yml | 8 +++--- roles/packer/tasks/install.yml | 4 +-- roles/sublime/tasks/install.yml | 4 +-- roles/sxiv/tasks/install.yml | 4 +-- roles/terraform/tasks/install.yml | 4 +-- roles/thunar-custom-actions/tasks/install.yml | 4 +-- roles/timemachine/tasks/install.yml | 4 +-- roles/urxvt/tasks/install.yml | 4 +-- roles/xbacklight/tasks/install.yml | 4 +-- 22 files changed, 52 insertions(+), 77 deletions(-) diff --git a/roles/autorunner/tasks/install.yml b/roles/autorunner/tasks/install.yml index c49d9f4..5c17b98 100644 --- a/roles/autorunner/tasks/install.yml +++ b/roles/autorunner/tasks/install.yml @@ -15,6 +15,6 @@ timeout: 30 register: task_result until: task_result is succeeded - retries: 10 - delay: 5 + retries: 30 + delay: 10 become: True diff --git a/roles/clipmenu/tasks/install.yml b/roles/clipmenu/tasks/install.yml index 05dbac1..4f41194 100644 --- a/roles/clipmenu/tasks/install.yml +++ b/roles/clipmenu/tasks/install.yml @@ -15,8 +15,8 @@ timeout: 30 register: task_result until: task_result is succeeded - retries: 10 - delay: 5 + retries: 30 + delay: 10 become: True with_items: - clipmenu diff --git a/roles/dbeaver/tasks/install.yml b/roles/dbeaver/tasks/install.yml index 179764f..0157292 100644 --- a/roles/dbeaver/tasks/install.yml +++ b/roles/dbeaver/tasks/install.yml @@ -21,6 +21,6 @@ timeout: 30 register: task_result until: task_result is succeeded - retries: 10 - delay: 5 + retries: 30 + delay: 10 notify: install dbeaver diff --git a/roles/diff-highlight/tasks/install.yml b/roles/diff-highlight/tasks/install.yml index 72e425f..2998c32 100644 --- a/roles/diff-highlight/tasks/install.yml +++ b/roles/diff-highlight/tasks/install.yml @@ -9,6 +9,6 @@ timeout: 30 register: task_result until: task_result is succeeded - retries: 10 - delay: 5 + retries: 30 + delay: 10 become: True diff --git a/roles/docker-compose/tasks/install.yml b/roles/docker-compose/tasks/install.yml index ba29d1b..037ae28 100644 --- a/roles/docker-compose/tasks/install.yml +++ b/roles/docker-compose/tasks/install.yml @@ -5,28 +5,3 @@ name: apt-meta vars: apt_packages: "{{ [docker_compose_package_name] }}" - -#- name: fetch docker compose info -# uri: -# url: https://api.github.com/repos/docker/compose/releases/latest -# method: GET -# register: docker_json -# check_mode: False -# -#- name: set latest docker compose version -# set_fact: -# docker_compose_version: "{{ docker_json.json.name }}" -# check_mode: False -# -#- name: ensure docker compose is downloaded -# get_url: -# url: "https://github.com/docker/compose/releases/download/{{ docker_compose_version }}/docker-compose-Linux-x86_64" -# dest: "{{ docker_compose_path }}" -# mode: 0755 -# force: True -# timeout: 30 -# register: task_result -# until: task_result is succeeded -# retries: 10 -# delay: 5 -# become: True diff --git a/roles/ffscreencast/tasks/install.yml b/roles/ffscreencast/tasks/install.yml index 36e9536..2936404 100644 --- a/roles/ffscreencast/tasks/install.yml +++ b/roles/ffscreencast/tasks/install.yml @@ -15,6 +15,6 @@ timeout: 30 register: task_result until: task_result is succeeded - retries: 10 - delay: 5 + retries: 30 + delay: 10 become: True diff --git a/roles/font-droid-sans-mono/tasks/install.yml b/roles/font-droid-sans-mono/tasks/install.yml index f5034c5..2ab9f39 100644 --- a/roles/font-droid-sans-mono/tasks/install.yml +++ b/roles/font-droid-sans-mono/tasks/install.yml @@ -16,8 +16,8 @@ timeout: 30 register: task_result until: task_result is succeeded - retries: 10 - delay: 5 + retries: 30 + delay: 10 with_items: - "{{ font_droid_sans_mono_urls }}" notify: update font-cache diff --git a/roles/font-font-awesome/tasks/install.yml b/roles/font-font-awesome/tasks/install.yml index 5b27b30..a716e31 100644 --- a/roles/font-font-awesome/tasks/install.yml +++ b/roles/font-font-awesome/tasks/install.yml @@ -16,8 +16,8 @@ timeout: 30 register: task_result until: task_result is succeeded - retries: 10 - delay: 5 + retries: 30 + delay: 10 with_items: - "{{ font_font_awesome_urls }}" notify: update font-cache diff --git a/roles/font-san-francisco/tasks/install.yml b/roles/font-san-francisco/tasks/install.yml index 8102cbd..e395125 100644 --- a/roles/font-san-francisco/tasks/install.yml +++ b/roles/font-san-francisco/tasks/install.yml @@ -16,8 +16,8 @@ timeout: 30 register: task_result until: task_result is succeeded - retries: 10 - delay: 5 + retries: 30 + delay: 10 with_items: - "{{ font_san_francisco_urls }}" notify: update font-cache diff --git a/roles/font-terminus/tasks/install.yml b/roles/font-terminus/tasks/install.yml index 9166d0e..40d4439 100644 --- a/roles/font-terminus/tasks/install.yml +++ b/roles/font-terminus/tasks/install.yml @@ -16,8 +16,8 @@ timeout: 30 register: task_result until: task_result is succeeded - retries: 10 - delay: 5 + retries: 30 + delay: 10 with_items: - "{{ font_terminus_bold_urls }}" - "{{ font_terminus_bold_italic_urls }}" diff --git a/roles/i3-utils-bin/tasks/install.yml b/roles/i3-utils-bin/tasks/install.yml index 423934f..842a56a 100644 --- a/roles/i3-utils-bin/tasks/install.yml +++ b/roles/i3-utils-bin/tasks/install.yml @@ -15,8 +15,8 @@ timeout: 30 register: task_result until: task_result is succeeded - retries: 10 - delay: 5 + retries: 30 + delay: 10 become: True with_items: - "{{ i3_utils_bin_tools }}" @@ -36,6 +36,6 @@ timeout: 30 register: task_result until: task_result is succeeded - retries: 10 - delay: 5 + retries: 30 + delay: 10 become: True diff --git a/roles/i3-utils-systemd/tasks/install.yml b/roles/i3-utils-systemd/tasks/install.yml index a10ce09..941d499 100644 --- a/roles/i3-utils-systemd/tasks/install.yml +++ b/roles/i3-utils-systemd/tasks/install.yml @@ -15,8 +15,8 @@ timeout: 30 register: task_result until: task_result is succeeded - retries: 10 - delay: 5 + retries: 30 + delay: 10 become: True - name: ensure systemd directories exist @@ -38,8 +38,8 @@ timeout: 30 register: task_result until: task_result is succeeded - retries: 10 - delay: 5 + retries: 30 + delay: 10 become: True # suspend.service requires the current user to be set @@ -60,8 +60,8 @@ timeout: 30 register: task_result until: task_result is succeeded - retries: 10 - delay: 5 + retries: 30 + delay: 10 changed_when: False check_mode: False diff --git a/roles/kops/tasks/install.yml b/roles/kops/tasks/install.yml index 9ce9627..60e92d9 100644 --- a/roles/kops/tasks/install.yml +++ b/roles/kops/tasks/install.yml @@ -15,8 +15,8 @@ register: kops_info_raw check_mode: False until: kops_info_raw is succeeded - retries: 10 - delay: 5 + retries: 30 + delay: 10 - debug: msg: "{{ kops_info_raw }}" @@ -30,8 +30,8 @@ timeout: 30 register: task_result until: task_result is succeeded - retries: 10 - delay: 5 + retries: 30 + delay: 10 become: True diff --git a/roles/kubectl/tasks/install.yml b/roles/kubectl/tasks/install.yml index e70c4f8..6cc4327 100644 --- a/roles/kubectl/tasks/install.yml +++ b/roles/kubectl/tasks/install.yml @@ -15,8 +15,8 @@ register: kubectl_info_raw check_mode: False until: kubectl_info_raw is succeeded - retries: 10 - delay: 5 + retries: 30 + delay: 10 - name: ensure kubectl is downloaded get_url: @@ -27,8 +27,8 @@ timeout: 30 register: task_result until: task_result is succeeded - retries: 10 - delay: 5 + retries: 30 + delay: 10 become: True diff --git a/roles/packer/tasks/install.yml b/roles/packer/tasks/install.yml index 91e17af..69d5615 100644 --- a/roles/packer/tasks/install.yml +++ b/roles/packer/tasks/install.yml @@ -15,8 +15,8 @@ register: packer_info_raw check_mode: False until: packer_info_raw is succeeded - retries: 10 - delay: 5 + retries: 30 + delay: 10 - name: set packer download url set_fact: diff --git a/roles/sublime/tasks/install.yml b/roles/sublime/tasks/install.yml index ce27e0a..39977c7 100644 --- a/roles/sublime/tasks/install.yml +++ b/roles/sublime/tasks/install.yml @@ -29,5 +29,5 @@ timeout: 30 register: task_result until: task_result is succeeded - retries: 10 - delay: 5 + retries: 30 + delay: 10 diff --git a/roles/sxiv/tasks/install.yml b/roles/sxiv/tasks/install.yml index 844b725..dd04872 100644 --- a/roles/sxiv/tasks/install.yml +++ b/roles/sxiv/tasks/install.yml @@ -15,8 +15,8 @@ timeout: 30 register: task_result until: task_result is succeeded - retries: 10 - delay: 5 + retries: 30 + delay: 10 become: True - name: ensure applications directory exist diff --git a/roles/terraform/tasks/install.yml b/roles/terraform/tasks/install.yml index 52f2d85..c712fd4 100644 --- a/roles/terraform/tasks/install.yml +++ b/roles/terraform/tasks/install.yml @@ -15,8 +15,8 @@ register: terraform_info_raw check_mode: False until: terraform_info_raw is succeeded - retries: 10 - delay: 5 + retries: 30 + delay: 10 - name: set terraform download url set_fact: diff --git a/roles/thunar-custom-actions/tasks/install.yml b/roles/thunar-custom-actions/tasks/install.yml index 0981ebc..34a0b91 100644 --- a/roles/thunar-custom-actions/tasks/install.yml +++ b/roles/thunar-custom-actions/tasks/install.yml @@ -15,8 +15,8 @@ timeout: 30 register: task_result until: task_result is succeeded - retries: 10 - delay: 5 + retries: 30 + delay: 10 become: True with_items: - "{{ thunar_custom_actions_tools }}" diff --git a/roles/timemachine/tasks/install.yml b/roles/timemachine/tasks/install.yml index f79db13..34ffb3f 100644 --- a/roles/timemachine/tasks/install.yml +++ b/roles/timemachine/tasks/install.yml @@ -15,6 +15,6 @@ timeout: 30 register: task_result until: task_result is succeeded - retries: 10 - delay: 5 + retries: 30 + delay: 10 become: True diff --git a/roles/urxvt/tasks/install.yml b/roles/urxvt/tasks/install.yml index 9ce6d4b..b72e662 100644 --- a/roles/urxvt/tasks/install.yml +++ b/roles/urxvt/tasks/install.yml @@ -24,8 +24,8 @@ timeout: 30 register: task_result until: task_result is succeeded - retries: 10 - delay: 5 + retries: 30 + delay: 10 become: True with_items: - "{{ urxvt_extensions }}" diff --git a/roles/xbacklight/tasks/install.yml b/roles/xbacklight/tasks/install.yml index 6425660..28e0848 100644 --- a/roles/xbacklight/tasks/install.yml +++ b/roles/xbacklight/tasks/install.yml @@ -17,8 +17,8 @@ timeout: 30 register: task_result until: task_result is succeeded - retries: 10 - delay: 5 + retries: 30 + delay: 10 become: True - name: ensure udev is installed