Browse Source

docker: remove some old debug code

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
pull/7160/head
Etienne Champetier 3 years ago
committed by Kubernetes Prow Robot
parent
commit
b2f3ab77cd
2 changed files with 0 additions and 18 deletions
  1. 1
      roles/container-engine/containerd/tasks/main.yml
  2. 17
      roles/container-engine/docker/tasks/main.yml

1
roles/container-engine/containerd/tasks/main.yml

@ -107,7 +107,6 @@
when:
- not is_ostree
- containerd_package_info.pkgs|length > 0
ignore_errors: true
- include_role:
name: container-engine/crictl

17
roles/container-engine/docker/tasks/main.yml

@ -159,7 +159,6 @@
with_items: "{{ docker_package_info.pkgs }}"
notify: restart docker
when: not (ansible_os_family in ["Flatcar Container Linux by Kinvolk", "ClearLinux"] or is_ostree) and (docker_package_info.pkgs|length > 0)
ignore_errors: true
- name: Ensure docker packages are installed
action: "{{ docker_package_info.pkg_mgr }}"
@ -172,24 +171,8 @@
retries: 4
delay: "{{ retry_stagger | d(3) }}"
notify: restart docker
ignore_errors: true
when: ansible_os_family in ["ClearLinux"]
- name: get available packages on Ubuntu
command: apt-cache policy docker-ce
when:
- docker_task_result is failed
- ansible_distribution == 'Ubuntu'
register: available_packages
check_mode: false
- name: show available packages on ubuntu
fail:
msg: "{{ available_packages }}"
when:
- docker_task_result is failed
- ansible_distribution == 'Ubuntu'
# This is required to ensure any apt upgrade will not break kubernetes
- name: Tell Debian hosts not to change the docker version with apt upgrade
dpkg_selections:

Loading…
Cancel
Save