Skip to content
Snippets Groups Projects
Unverified Commit 6f1352eb authored by Eugene Artemenko's avatar Eugene Artemenko Committed by GitHub
Browse files

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

parent bf8c64af
No related branches found
No related tags found
No related merge requests found
...@@ -29,6 +29,9 @@ ...@@ -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}
......
...@@ -65,6 +65,7 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment