Merge "Revert "Temporary fix of failing aria2 on centos""
This commit is contained in:
commit
a6cae27fa3
|
@ -23,25 +23,12 @@
|
||||||
when:
|
when:
|
||||||
- lxc_image_cache_refresh | bool
|
- lxc_image_cache_refresh | bool
|
||||||
|
|
||||||
- block:
|
|
||||||
- name: Ensure image has been pre-staged
|
- name: Ensure image has been pre-staged
|
||||||
async_status:
|
async_status:
|
||||||
jid: "{{ prestage_image.ansible_job_id }}"
|
jid: "{{ prestage_image.ansible_job_id }}"
|
||||||
register: job_result
|
register: job_result
|
||||||
until: job_result.finished
|
until: job_result.finished
|
||||||
retries: 60
|
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 systemd-importd is enabled
|
- name: Ensure systemd-importd is enabled
|
||||||
systemd:
|
systemd:
|
||||||
|
|
|
@ -32,25 +32,12 @@
|
||||||
when:
|
when:
|
||||||
- lxc_image_cache_refresh | bool
|
- lxc_image_cache_refresh | bool
|
||||||
|
|
||||||
- block:
|
|
||||||
- name: Ensure image has been pre-staged
|
- name: Ensure image has been pre-staged
|
||||||
async_status:
|
async_status:
|
||||||
jid: "{{ prestage_image.ansible_job_id }}"
|
jid: "{{ prestage_image.ansible_job_id }}"
|
||||||
register: job_result
|
register: job_result
|
||||||
until: job_result.finished
|
until: job_result.finished
|
||||||
retries: 60
|
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: Place container rootfs
|
- name: Place container rootfs
|
||||||
unarchive:
|
unarchive:
|
||||||
|
|
Loading…
Reference in New Issue