Merge "Revert "Temporary fix of failing aria2 on centos""

This commit is contained in:
Zuul 2019-05-20 10:37:18 +00:00 committed by Gerrit Code Review
commit a6cae27fa3
2 changed files with 12 additions and 38 deletions

View File

@ -23,25 +23,12 @@
when:
- lxc_image_cache_refresh | bool
- block:
- name: Ensure image has been pre-staged
async_status:
jid: "{{ prestage_image.ansible_job_id }}"
register: job_result
until: job_result.finished
retries: 60
rescue:
- name: Trying to download image with alternate method
get_url:
url: "{{ lxc_hosts_container_image_url }}"
dest: "/tmp/{{ cache_basename }}"
validate_certs: "{{ (lxc_hosts_validate_certs | bool) | lower }}"
force: true
timeout: 15
register: image_download
until: image_download is success
retries: 3
delay: 2
- name: Ensure image has been pre-staged
async_status:
jid: "{{ prestage_image.ansible_job_id }}"
register: job_result
until: job_result.finished
retries: 60
- name: Ensure systemd-importd is enabled
systemd:

View File

@ -32,25 +32,12 @@
when:
- lxc_image_cache_refresh | bool
- block:
- name: Ensure image has been pre-staged
async_status:
jid: "{{ prestage_image.ansible_job_id }}"
register: job_result
until: job_result.finished
retries: 60
rescue:
- name: Trying to download image with alternate method
get_url:
url: "{{ lxc_hosts_container_image_url }}"
dest: "/tmp/{{ cache_basename }}"
validate_certs: "{{ (lxc_hosts_validate_certs | bool) | lower }}"
force: true
timeout: 15
register: image_download
until: image_download is success
retries: 3
delay: 2
- name: Ensure image has been pre-staged
async_status:
jid: "{{ prestage_image.ansible_job_id }}"
register: job_result
until: job_result.finished
retries: 60
- name: Place container rootfs
unarchive: