From f8fc149b9998aeef832fdf2d675c1405884a6b17 Mon Sep 17 00:00:00 2001
From: Ali Mehraji <a.mehraji75@gmail.com>
Date: Sun, 2 Feb 2025 18:53:58 +0330
Subject: [PATCH] update: seperate the docker_obsolete_packages to their
 ansible_os_family based files in vars

---
 README.md              | 15 +--------------
 defaults/main.yml      | 11 -----------
 tasks/setup-Debian.yml |  2 +-
 tasks/setup-RedHat.yml |  2 +-
 vars/Debian.yml        | 11 +++++++++++
 vars/RedHat.yml        | 10 ++++++++++
 6 files changed, 24 insertions(+), 27 deletions(-)
 create mode 100644 vars/Debian.yml
 create mode 100644 vars/RedHat.yml

diff --git a/README.md b/README.md
index d041506..41be07a 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ You can control whether the package is installed, uninstalled, or at the latest
 
 ```yaml
 # Used only for Debian/Ubuntu
-docker_obsolete_packages_debian:
+docker_obsolete_packages:
   - docker
   - docker.io
   - docker-engine
@@ -41,19 +41,6 @@ docker_obsolete_packages_debian:
   - podman-docker
   - containerd
   - runc
-
-# Used only for Fedora/CentOS/Rocky
-docker_obsolete_packages_redhat:
-  - docker
-  - docker-client
-  - docker-client-latest
-  - docker-common
-  - docker-latest
-  - docker-latest-logrotate
-  - docker-logrotate
-  - docker-selinux
-  - docker-engine-selinux
-  - docker-engine
 ```
 
 A list of packages to be uninstalled prior to running this role. See Docker's installation instructions for an up-to-date list of old packages that should be removed:
diff --git a/defaults/main.yml b/defaults/main.yml
index 5a5934d..ad261ce 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -21,17 +21,6 @@ docker_obsolete_packages_debian:
   - containerd
   - runc
 
-# Used only for Fedora/CentOS/Rocky
-docker_obsolete_packages_redhat:
-  - docker
-  - docker-client
-  - docker-client-latest
-  - docker-common
-  - docker-latest
-  - docker-latest-logrotate
-  - docker-logrotate
-  - docker-engine
-
 # Service options.
 docker_service_manage: true
 docker_service_state: started
diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml
index d671fbd..f360c4a 100644
--- a/tasks/setup-Debian.yml
+++ b/tasks/setup-Debian.yml
@@ -20,7 +20,7 @@
 - # See https://docs.docker.com/engine/install/debian/#uninstall-old-versions
   name: Ensure old versions of Docker are not installed.
   ansible.builtin.package:
-    name: "{{ docker_obsolete_packages_debian }}"
+    name: "{{ docker_obsolete_packages }}"
     state: absent
 
 - name: Ensure dependencies are installed.
diff --git a/tasks/setup-RedHat.yml b/tasks/setup-RedHat.yml
index ce94a66..0a9784e 100644
--- a/tasks/setup-RedHat.yml
+++ b/tasks/setup-RedHat.yml
@@ -3,7 +3,7 @@
 # or  https://docs.docker.com/engine/install/centos/#uninstall-old-versions
 - name: Ensure old versions of Docker are not installed.
   ansible.builtin.package:
-    name: "{{ docker_obsolete_packages_redhat }}"
+    name: "{{ docker_obsolete_packages }}"
     state: absent
 
 - name: Add Docker GPG key.
diff --git a/vars/Debian.yml b/vars/Debian.yml
new file mode 100644
index 0000000..55ea062
--- /dev/null
+++ b/vars/Debian.yml
@@ -0,0 +1,11 @@
+# Used only for Debian/Ubuntu
+docker_obsolete_packages:
+  - docker
+  - docker.io
+  - docker-engine
+  - docker-doc
+  - docker-compose
+  - docker-compose-v2
+  - podman-docker
+  - containerd
+  - runc
\ No newline at end of file
diff --git a/vars/RedHat.yml b/vars/RedHat.yml
new file mode 100644
index 0000000..fbacd81
--- /dev/null
+++ b/vars/RedHat.yml
@@ -0,0 +1,10 @@
+# Used only for Fedora/CentOS/Rocky
+docker_obsolete_packages:
+  - docker
+  - docker-client
+  - docker-client-latest
+  - docker-common
+  - docker-latest
+  - docker-latest-logrotate
+  - docker-logrotate
+  - docker-engine
\ No newline at end of file