Skip retry operation with containerd when etcd installed on host VM (#9560)

pull/9657/head
Eugene Artemenko 2023-01-11 01:53:20 +02:00 committed by GitHub
parent bf8c64af08
commit 6f1352eb53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions

View File

@ -29,6 +29,9 @@
msg: "Reset confirmation failed" msg: "Reset confirmation failed"
when: reset_confirmation != "yes" when: reset_confirmation != "yes"
- name: Gather information about installed services
service_facts:
environment: "{{ proxy_disable_env }}" environment: "{{ proxy_disable_env }}"
roles: roles:
- { role: kubespray-defaults} - { role: kubespray-defaults}

View File

@ -65,6 +65,7 @@
when: when:
- crictl.stat.exists - crictl.stat.exists
- container_manager in ["crio", "containerd"] - container_manager in ["crio", "containerd"]
- ansible_facts.services['containerd.service'] is defined or ansible_facts.services['cri-o.service'] is defined
ignore_errors: true # noqa ignore-errors ignore_errors: true # noqa ignore-errors
- name: reset | force remove all cri containers - name: reset | force remove all cri containers
@ -80,6 +81,7 @@
- crictl.stat.exists - crictl.stat.exists
- container_manager in ["crio", "containerd"] - container_manager in ["crio", "containerd"]
- deploy_container_engine - deploy_container_engine
- ansible_facts.services['containerd.service'] is defined or ansible_facts.services['cri-o.service'] is defined
ignore_errors: true # noqa ignore-errors ignore_errors: true # noqa ignore-errors
- name: reset | stop and disable crio service - name: reset | stop and disable crio service
@ -109,6 +111,7 @@
when: when:
- crictl.stat.exists - crictl.stat.exists
- container_manager == "containerd" - container_manager == "containerd"
- ansible_facts.services['containerd.service'] is defined or ansible_facts.services['cri-o.service'] is defined
ignore_errors: true # noqa ignore-errors ignore_errors: true # noqa ignore-errors
- block: - block:
@ -122,6 +125,7 @@
when: when:
- crictl.stat.exists - crictl.stat.exists
- container_manager == "containerd" - container_manager == "containerd"
- ansible_facts.services['containerd.service'] is defined or ansible_facts.services['cri-o.service'] is defined
rescue: rescue:
- name: reset | force remove all cri pods (rescue) - name: reset | force remove all cri pods (rescue)