diff --git a/README.md b/README.md index 28d9efb..f3d4943 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ You can control whether the package is installed, uninstalled, or at the latest docker_obsolete_packages: ``` -A list of packages to be uninstalled on all platforms prior to running this role. By default this will `docker_obsolete_packages_debian` on debian based systems and `docker_obsolete_packages_redhat` on redhat systems. +A list of packages to be uninstalled on all platforms prior to running this role. By default this will `docker_obsolete_packages_debian` on debian based systems. ```yaml docker_obsolete_packages_debian: @@ -47,19 +47,6 @@ docker_obsolete_packages_debian: ``` A list of packages to be uninstalled on Debian based systems prior to running this role. See [Docker's installation instructions](https://docs.docker.com/engine/install/debian/#uninstall-old-versions) for an up-to-date list of old packages that should be removed. -```yaml -docker_obsolete_packages_redhat: - - docker - - docker-client - - docker-client-latest - - docker-common - - docker-latest - - docker-latest-logrotate - - docker-logrotate - - docker-engine - - podman - - runc -``` A list of packaged to be uninstalled on RedHat based systems prior to running this role. See [Docker's installation instructions](https://docs.docker.com/engine/install/rhel/#uninstall-old-versions) for an up-to-date list of old packages that should be removed. diff --git a/defaults/main.yml b/defaults/main.yml index 3c8b646..561491f 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -18,17 +18,6 @@ docker_obsolete_packages_debian: - podman-docker - containerd - runc -docker_obsolete_packages_redhat: - - docker - - docker-client - - docker-client-latest - - docker-common - - docker-latest - - docker-latest-logrotate - - docker-logrotate - - docker-engine - - podman - - runc # Service options. docker_service_manage: true diff --git a/tasks/setup-RedHat.yml b/tasks/setup-RedHat.yml index 0607e2f..4d5399d 100644 --- a/tasks/setup-RedHat.yml +++ b/tasks/setup-RedHat.yml @@ -1,18 +1,4 @@ --- -- name: Set obselete packages if not already defined - set_fact: - docker_obsolete_packages: "{{ docker_obsolete_packages_redhat }}" - when: docker_obsolete_packages is not defined - -- name: Ensure old versions of Docker are not installed. - package: - name: "{{ docker_obsolete_packages }}" - state: absent - register: obsolete_package_results - failed_when: - - '"Depsolve Error occurred" not in obsolete_package_results.msg' - - obsolete_package_results.rc == 0 - - name: Add Docker GPG key. rpm_key: key: "{{ docker_yum_gpg_key }}"