mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-02-16 10:40:04 -03:30
Fix ansible syntax to avoid ansible deprecation warnings (#3512)
* failed * version_compare * succeeded * skipped * success * version_compare becomes version since ansible 2.5 * ansible minimal version updated in doc and spec * last version_compare
This commit is contained in:
committed by
k8s-ci-robot
parent
bfd4ccbeaa
commit
7bec169d58
@@ -45,7 +45,7 @@
|
||||
docker requires a minimum kernel version of
|
||||
{{ docker_kernel_min_version }} on
|
||||
{{ ansible_distribution }}-{{ ansible_distribution_version }}
|
||||
when: (not ansible_os_family in ["CoreOS", "Container Linux by CoreOS"]) and (ansible_kernel|version_compare(docker_kernel_min_version, "<"))
|
||||
when: (not ansible_os_family in ["CoreOS", "Container Linux by CoreOS"]) and (ansible_kernel is version(docker_kernel_min_version, "<"))
|
||||
tags:
|
||||
- facts
|
||||
|
||||
@@ -58,7 +58,7 @@
|
||||
url: "{{docker_repo_key_info.url}}"
|
||||
state: present
|
||||
register: keyserver_task_result
|
||||
until: keyserver_task_result|succeeded
|
||||
until: keyserver_task_result is succeeded
|
||||
retries: 4
|
||||
delay: "{{ retry_stagger | d(3) }}"
|
||||
with_items: "{{ docker_repo_key_info.repo_keys }}"
|
||||
@@ -79,7 +79,7 @@
|
||||
url: "{{dockerproject_repo_key_info.url}}"
|
||||
state: present
|
||||
register: keyserver_task_result
|
||||
until: keyserver_task_result|succeeded
|
||||
until: keyserver_task_result is succeeded
|
||||
retries: 4
|
||||
delay: "{{ retry_stagger | d(3) }}"
|
||||
with_items: "{{ dockerproject_repo_key_info.repo_keys }}"
|
||||
@@ -134,7 +134,7 @@
|
||||
state: present
|
||||
update_cache: "{{ omit if ansible_distribution == 'Fedora' else True }}"
|
||||
register: docker_task_result
|
||||
until: docker_task_result|succeeded
|
||||
until: docker_task_result is succeeded
|
||||
retries: 4
|
||||
delay: "{{ retry_stagger | d(3) }}"
|
||||
with_items: "{{ docker_package_info.pkgs }}"
|
||||
@@ -145,7 +145,7 @@
|
||||
- name: get available packages on Ubuntu
|
||||
command: apt-cache policy docker-ce
|
||||
when:
|
||||
- docker_task_result|failed
|
||||
- docker_task_result is failed
|
||||
- ansible_distribution == 'Ubuntu'
|
||||
register: available_packages
|
||||
|
||||
@@ -153,7 +153,7 @@
|
||||
fail:
|
||||
msg: "{{available_packages}}"
|
||||
when:
|
||||
- docker_task_result|failed
|
||||
- docker_task_result is failed
|
||||
- ansible_distribution == 'Ubuntu'
|
||||
|
||||
# This is required to ensure any apt upgrade will not break kubernetes
|
||||
@@ -185,7 +185,7 @@
|
||||
when: >
|
||||
dns_mode != 'none' and
|
||||
resolvconf_mode == 'docker_dns' and
|
||||
installed_docker_version.stdout|version_compare('1.12', '<')
|
||||
installed_docker_version.stdout is version('1.12', '<')
|
||||
|
||||
- name: Set docker systemd config
|
||||
import_tasks: systemd.yml
|
||||
|
||||
@@ -21,7 +21,7 @@ Environment=GOTRACEBACK=crash
|
||||
ExecReload=/bin/kill -s HUP $MAINPID
|
||||
Delegate=yes
|
||||
KillMode=process
|
||||
ExecStart={{ docker_bin_dir }}/docker{% if installed_docker_version.stdout|version_compare('17.03', '<') %} daemon{% else %}d{% endif %} \
|
||||
ExecStart={{ docker_bin_dir }}/docker{% if installed_docker_version.stdout is version('17.03', '<') %} daemon{% else %}d{% endif %} \
|
||||
{% if ansible_os_family == "Suse" %}
|
||||
--containerd /run/containerd/containerd.sock --add-runtime oci=/usr/bin/docker-runc \
|
||||
{% endif %}
|
||||
|
||||
@@ -41,7 +41,7 @@ docker_pkgs:
|
||||
docker_package_info:
|
||||
pkg_mgr: yum
|
||||
pkgs: |-
|
||||
{%- if docker_version | version_compare('17.04', '<') -%}
|
||||
{%- if docker_version is version('17.04', '<') -%}
|
||||
{{ docker_pkgs_use_docker_ce }}
|
||||
{%- else -%}
|
||||
{{ docker_pkgs }}
|
||||
|
||||
Reference in New Issue
Block a user