mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-10-29 22:03:22 -02:30
Remove obsolete "Flatcar Container Linux by Kinvolk" fact checks (#13528)
Signed-off-by: Ali Afsharzadeh <afsharzadeh8@gmail.com>
This commit is contained in:
@@ -116,7 +116,6 @@ containerd_supported_distributions:
|
||||
- "Rocky"
|
||||
- "Amazon"
|
||||
- "Flatcar"
|
||||
- "Flatcar Container Linux by Kinvolk"
|
||||
- "Suse"
|
||||
- "openSUSE Leap"
|
||||
- "openSUSE Tumbleweed"
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
service:
|
||||
name: docker.socket
|
||||
state: restarted
|
||||
when: ansible_facts['os_family'] in ['Flatcar', 'Flatcar Container Linux by Kinvolk'] or is_fedora_coreos
|
||||
when: ansible_facts['os_family'] == 'Flatcar' or is_fedora_coreos
|
||||
listen: Restart docker
|
||||
|
||||
|
||||
|
||||
@@ -131,7 +131,7 @@
|
||||
delay: "{{ retry_stagger }}"
|
||||
notify: Restart docker
|
||||
when:
|
||||
- not ansible_facts['os_family'] in ["Flatcar", "Flatcar Container Linux by Kinvolk"]
|
||||
- ansible_facts['os_family'] != "Flatcar"
|
||||
- not is_ostree
|
||||
- docker_package_info.pkgs | length > 0
|
||||
|
||||
|
||||
@@ -61,7 +61,7 @@
|
||||
- "{{ docker_packages_list }}"
|
||||
- "{{ containerd_package }}"
|
||||
when:
|
||||
- not ansible_facts['os_family'] in ["Flatcar", "Flatcar Container Linux by Kinvolk"]
|
||||
- ansible_facts['os_family'] != "Flatcar"
|
||||
- not is_ostree
|
||||
- docker_packages_list | length > 0
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
register: docker_service_file
|
||||
notify: Restart docker
|
||||
when:
|
||||
- not ansible_facts['os_family'] in ["Flatcar", "Flatcar Container Linux by Kinvolk"]
|
||||
- ansible_facts['os_family'] != "Flatcar"
|
||||
- not is_fedora_coreos
|
||||
|
||||
- name: Write docker options systemd drop-in
|
||||
|
||||
@@ -14,7 +14,6 @@
|
||||
- name: Runc | Uninstall runc package managed by package manager
|
||||
when:
|
||||
- not is_ostree
|
||||
- ansible_facts['distribution'] != "Flatcar Container Linux by Kinvolk"
|
||||
- ansible_facts['distribution'] != "Flatcar"
|
||||
block:
|
||||
- name: Runc | Remove package
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
name: skopeo
|
||||
state: absent
|
||||
when:
|
||||
- not (is_ostree or (ansible_facts['distribution'] == "Flatcar Container Linux by Kinvolk") or (ansible_facts['distribution'] == "Flatcar"))
|
||||
- not (is_ostree or ansible_facts['distribution'] == "Flatcar")
|
||||
ignore_errors: true # noqa ignore-errors
|
||||
|
||||
- name: Skopeo | Download skopeo binary
|
||||
|
||||
@@ -76,7 +76,7 @@
|
||||
vars:
|
||||
service_name: containerd.service
|
||||
when:
|
||||
- not (is_ostree or (ansible_facts['distribution'] == "Flatcar Container Linux by Kinvolk") or (ansible_facts['distribution'] == "Flatcar"))
|
||||
- not (is_ostree or ansible_facts['distribution'] == "Flatcar")
|
||||
- container_manager != "containerd"
|
||||
- docker_installed.matched == 0
|
||||
- containerd_installed.matched > 0
|
||||
@@ -104,7 +104,7 @@
|
||||
vars:
|
||||
service_name: docker.service
|
||||
when:
|
||||
- not (is_ostree or (ansible_facts['distribution'] == "Flatcar Container Linux by Kinvolk") or (ansible_facts['distribution'] == "Flatcar"))
|
||||
- not (is_ostree or ansible_facts['distribution'] == "Flatcar")
|
||||
- container_manager != "docker"
|
||||
- docker_installed.matched > 0
|
||||
- ansible_facts.services[service_name]['state'] == 'running'
|
||||
@@ -130,7 +130,7 @@
|
||||
vars:
|
||||
service_name: crio.service
|
||||
when:
|
||||
- not (is_ostree or (ansible_facts['distribution'] == "Flatcar Container Linux by Kinvolk") or (ansible_facts['distribution'] == "Flatcar"))
|
||||
- not (is_ostree or ansible_facts['distribution'] == "Flatcar")
|
||||
- container_manager != "crio"
|
||||
- crio_installed.matched > 0
|
||||
- ansible_facts.services[service_name]['state'] == 'running'
|
||||
|
||||
Reference in New Issue
Block a user