diff --git a/README.md b/README.md index 5d92029cd5c2d6ce2a5fe1c377b6be94e7538ebe..eaf1dcd32526af0e7f53d37620fbff8113eae732 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,6 @@ Variables from vars directory: * packages_to_remove : list of packages that we want to remove from default delivered servers * packages_to_install : list of packages to install on server * Global (main.yml): - * pip_packages: Python pip packages to be installed / upgraded * timezone: for Traefik logs (defaults to "Europe/Paris") * traefik_version: "v2.9.6" diff --git a/tasks/main.yml b/tasks/main.yml index 27173821e3c6d9894b26a82a17bac72ae98cd2db..58dc36b8635df7558d548c89853073daf41f2118 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -59,13 +59,6 @@ state: latest when: ansible_check_mode -- name: Update pip - pip: - name: ['{{ item }}'] - executable: pip3 - state: latest - with_items: "{{ pip_packages }}" - - name: Create /etc/docker repo file: name: /etc/docker diff --git a/vars/Debian.yml b/vars/Debian.yml index 1f4651c47b3c85480d7885c87b599113fbb95d44..665e91821cbd16180043a67eb01846be1b3ff119 100644 --- a/vars/Debian.yml +++ b/vars/Debian.yml @@ -1,18 +1,19 @@ --- packages_to_remove: - containerd - - docker - - docker-engine + - docker-compose + - docker-doc - docker.io + - podman-docker - runc packages_to_install: - build-essential - ca-certificates - curl + - containerd.io + - docker-buildx-plugin - docker-ce + - docker-ce-cli + - docker-compose-plugin - git - - python3-dev - - python3-docker - - python3-pip - - python3-setuptools - - software-properties-common + - gnupg diff --git a/vars/RedHat.yml b/vars/RedHat.yml index 191baf67a0652df4ba58ac6dbcc1f08fe3f5d7ff..1f17e31c35db5cef22ad0e37ec973ded50d8e060 100644 --- a/vars/RedHat.yml +++ b/vars/RedHat.yml @@ -8,12 +8,11 @@ packages_to_remove: - docker-latest - docker-latest-logrotate - docker-logrotate + - podman + - runc packages_to_install: - - device-mapper-persistent-data + - containerd.io + - docker-buildx-plugin - docker-ce - - gcc - - lvm2 - - python3-devel - - python3-docker - - python3-pip - - python3-setuptools + - docker-ce-cli + - docker-compose-plugin diff --git a/vars/main.yml b/vars/main.yml index e5dffd09b848305b43f03539d056d395d5a5443e..282afff333f4b6bae255f5f3f7f51a74cd3413bd 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,6 +1,3 @@ --- -pip_packages: - - pip - - docker_compose timezone: "Europe/Paris" traefik_version: "v2.10"