diff --git a/roles/container-engine/docker/tasks/main.yml b/roles/container-engine/docker/tasks/main.yml index 5495bd84f..69309ca1e 100644 --- a/roles/container-engine/docker/tasks/main.yml +++ b/roles/container-engine/docker/tasks/main.yml @@ -37,16 +37,6 @@ tags: - facts -- name: check for minimum kernel version - fail: - msg: > - docker requires a minimum kernel version of - {{ docker_kernel_min_version }} on - {{ ansible_distribution }}-{{ ansible_distribution_version }} - when: (not ansible_os_family in ["Flatcar Container Linux by Kinvolk", "ClearLinux"]) and (ansible_kernel is version(docker_kernel_min_version, "<")) - tags: - - facts - - name: disable unified_cgroup_hierarchy in Fedora 31+ command: grubby --update-kernel=ALL --args="systemd.unified_cgroup_hierarchy=0" when: diff --git a/roles/container-engine/docker/vars/amazon.yml b/roles/container-engine/docker/vars/amazon.yml index 7de729ac8..468949f5c 100644 --- a/roles/container-engine/docker/vars/amazon.yml +++ b/roles/container-engine/docker/vars/amazon.yml @@ -1,6 +1,4 @@ --- -docker_kernel_min_version: '0' - # https://docs.aws.amazon.com/en_us/AmazonECS/latest/developerguide/docker-basics.html docker_versioned_pkg: diff --git a/roles/container-engine/docker/vars/debian.yml b/roles/container-engine/docker/vars/debian.yml index dc42ffafd..5338d183b 100644 --- a/roles/container-engine/docker/vars/debian.yml +++ b/roles/container-engine/docker/vars/debian.yml @@ -1,6 +1,4 @@ --- -docker_kernel_min_version: '3.10' - # https://download.docker.com/linux/debian/ docker_versioned_pkg: 'latest': docker-ce diff --git a/roles/container-engine/docker/vars/fedora.yml b/roles/container-engine/docker/vars/fedora.yml index 531b2c02d..1284eaacd 100644 --- a/roles/container-engine/docker/vars/fedora.yml +++ b/roles/container-engine/docker/vars/fedora.yml @@ -1,6 +1,4 @@ --- -docker_kernel_min_version: '0' - # https://docs.docker.com/install/linux/docker-ce/fedora/ # https://download.docker.com/linux/fedora//x86_64/stable/Packages/ docker_versioned_pkg: diff --git a/roles/container-engine/docker/vars/redhat.yml b/roles/container-engine/docker/vars/redhat.yml index 338356ce9..0298da510 100644 --- a/roles/container-engine/docker/vars/redhat.yml +++ b/roles/container-engine/docker/vars/redhat.yml @@ -1,6 +1,4 @@ --- -docker_kernel_min_version: '0' - # https://docs.docker.com/engine/installation/linux/centos/#install-from-a-package # https://download.docker.com/linux/centos/>/x86_64/stable/Packages/ # or do 'yum --showduplicates list docker-engine' diff --git a/roles/container-engine/docker/vars/suse.yml b/roles/container-engine/docker/vars/suse.yml index 0353286ca..75458fcd0 100644 --- a/roles/container-engine/docker/vars/suse.yml +++ b/roles/container-engine/docker/vars/suse.yml @@ -1,6 +1,4 @@ --- -docker_kernel_min_version: '0' - docker_package_info: pkg_mgr: zypper pkgs: diff --git a/roles/container-engine/docker/vars/ubuntu.yml b/roles/container-engine/docker/vars/ubuntu.yml index 4050bf2a5..959378dfa 100644 --- a/roles/container-engine/docker/vars/ubuntu.yml +++ b/roles/container-engine/docker/vars/ubuntu.yml @@ -1,6 +1,4 @@ --- -docker_kernel_min_version: '3.10' - # https://download.docker.com/linux/ubuntu/ docker_versioned_pkg: 'latest': docker-ce