External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-05-23 08:37:54 -02:30
Code Issues Packages Projects Releases Wiki Activity

Add support to Ansible 2.9 (#5361)

Browse Source
This commit is contained in:
Maxime Guyot
2019-12-05 16:24:32 +01:00
committed by Kubernetes Prow Robot
parent 7da2083986
commit b15d41a96a
27 changed files with 58 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
roles/download/tasks/download_container.yml
View File

@@ -50,7 +50,7 @@
- download_force_cache
- image_is_cached
- not download_localhost
- ansible_os_family not in ["CoreOS", "Container Linux by CoreOS"]
- ansible_os_family not in ["CoreOS", "Coreos", "Container Linux by CoreOS"]
- name: download_container | Load image into docker
shell: "{{ docker_bin_dir }}/docker load < {{ image_path_cached if download_localhost else image_path_final }}"
@@ -62,7 +62,7 @@
when:
- download_force_cache
- image_is_cached
- ansible_os_family not in ["CoreOS", "Container Linux by CoreOS"]
- ansible_os_family not in ["CoreOS", "Coreos", "Container Linux by CoreOS"]
- name: download_container | Prepare container download
include_tasks: check_pull_required.yml
@@ -109,7 +109,7 @@
when:
- download_force_cache
- not image_is_cached or (image_changed | default(true))
- ansible_os_family not in ["CoreOS", "Container Linux by CoreOS"]
- ansible_os_family not in ["CoreOS", "Coreos", "Container Linux by CoreOS"]
- name: download_container | Copy image to ansible host cache
synchronize:
@@ -123,7 +123,7 @@
- not download_localhost
- download_delegate == inventory_hostname
- not image_is_cached or (image_changed | default(true))
- ansible_os_family not in ["CoreOS", "Container Linux by CoreOS"]
- ansible_os_family not in ["CoreOS", "Coreos", "Container Linux by CoreOS"]
- name: download_container | Remove container image from cache
file:
@@ -131,7 +131,7 @@
path: "{{ image_path_final }}"
when:
- not download_keep_remote_cache
- ansible_os_family not in ["CoreOS", "Container Linux by CoreOS"]
- ansible_os_family not in ["CoreOS", "Coreos", "Container Linux by CoreOS"]
tags:
- download