Merge branch 'geerlingguy:master' into master

Uninstall docker.io on apt distros

tasks/main.yml

@@ -4,9 +4,7 @@
   vars:
     params:
       files:
-        - '{{ansible_distribution}}-{{ansible_distribution_major_version}}.yml'
         - '{{ansible_distribution}}.yml'
-        - '{{ansible_os_family}}-{{ansible_distribution_major_version}}.yml'
         - '{{ansible_os_family}}.yml'
         - main.yml
       paths:
@@ -18,9 +16,6 @@
 - include_tasks: setup-Debian.yml
   when: ansible_os_family == 'Debian'
 
-- include_tasks: setup-Altlinux.yml
-  when: ansible_os_family == 'Altlinux'
-
 - name: Install Docker packages.
   package:
     name: "{{ docker_packages }}"

tasks/setup-Altlinux.yml

@@ -1,7 +0,0 @@
----
-- name: "Update cache"
-  package:
-    update_cache: true
-- name: "Ensure needed packages are installed"
-  package:
-    name: "python3-module-pkg_resources"

tasks/setup-Debian.yml

@@ -3,6 +3,7 @@
   package:
     name:
       - docker
+      - docker.io
       - docker-engine
     state: absent
 

vars/Altlinux-8.yml

@@ -1,3 +0,0 @@
----
-docker_packages: "docker-ce"
-docker_compose_package: "docker-compose"

vars/Altlinux-9.yml

@@ -1,3 +0,0 @@
----
-docker_packages: "docker-ce"
-docker_compose_package: "docker-compose"

vars/Altlinux.yml

@@ -1,3 +0,0 @@
----
-docker_packages: "docker-engine"
-docker_compose_package: "docker-compose-v2"