From b2f3ab77cdf5b6eb59d5d533b21ac14120ca4c83 Mon Sep 17 00:00:00 2001
From: Etienne Champetier <champetier.etienne@gmail.com>
Date: Thu, 7 Jan 2021 15:34:35 -0500
Subject: [PATCH] docker: remove some old debug code
Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
---
.../container-engine/containerd/tasks/main.yml | 1 -
roles/container-engine/docker/tasks/main.yml | 17 -----------------
2 files changed, 18 deletions(-)
diff --git a/roles/container-engine/containerd/tasks/main.yml b/roles/container-engine/containerd/tasks/main.yml
index 429277069..f139fa75f 100644
--- a/roles/container-engine/containerd/tasks/main.yml
+++ b/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
diff --git a/roles/container-engine/docker/tasks/main.yml b/roles/container-engine/docker/tasks/main.yml
index 1c624a9e6..4ff88b88f 100644
--- a/roles/container-engine/docker/tasks/main.yml
+++ b/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:
--
GitLab