diff --git a/CHANGELOG.md b/CHANGELOG.md index 87242546..e1de215f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ The **patch** part changes incrementally at each release. ### Changed +* Use python3 modules for Debian 11 and later * elasticsearch: 7.x by default * evolinux-base: copy GPG key instead of using apt-key * evolinux-base: force Debian version to buster for Evolix repository (temporary) diff --git a/docker-host/tasks/main.yml b/docker-host/tasks/main.yml index d3a41a28..796c800d 100644 --- a/docker-host/tasks/main.yml +++ b/docker-host/tasks/main.yml @@ -40,9 +40,20 @@ apt: name: - docker-ce - - python-docker update_cache: yes +- name: python-docker is installed + apt: + name: python-docker + state: present + when: ansible_distribution_major_version is version('10', '<=') + +- name: python3-docker is installed + apt: + name: python3-docker + state: present + when: ansible_distribution_major_version is version('10', '>') + - name: Copy Docker daemon configuration file template: src: daemon.json.j2 diff --git a/lxc/tasks/main.yml b/lxc/tasks/main.yml index a3a31cf5..74ba69ae 100644 --- a/lxc/tasks/main.yml +++ b/lxc/tasks/main.yml @@ -5,7 +5,18 @@ - lxc - debootstrap - xz-utils - - python-lxc + +- name: python-lxc is installed + apt: + name: python-lxc + state: present + when: ansible_distribution_major_version is version('10', '<=') + +- name: python3-lxc is installed + apt: + name: python3-lxc + state: present + when: ansible_distribution_major_version is version('10', '>') - name: Install additional packages on Buster apt: diff --git a/mongodb/tasks/main_bullseye.yml b/mongodb/tasks/main_bullseye.yml index a2ef6038..e8415b03 100644 --- a/mongodb/tasks/main_bullseye.yml +++ b/mongodb/tasks/main_bullseye.yml @@ -31,7 +31,7 @@ - name: install dependency for monitoring apt: - name: python-pymongo + name: python3-pymongo state: present - name: Custom configuration diff --git a/postgresql/tasks/nrpe.yml b/postgresql/tasks/nrpe.yml index 740c7b08..9c22e293 100644 --- a/postgresql/tasks/nrpe.yml +++ b/postgresql/tasks/nrpe.yml @@ -9,10 +9,17 @@ register: postgresql_nrpe_password changed_when: False -- name: Install python dependencies for postgresql_user +- name: python-psycopg2 is installed (Ansible dependency) apt: name: python-psycopg2 state: present + when: ansible_distribution_major_version is version('10', '<=') + +- name: python3-psycopg2 is installed (Ansible dependency) + apt: + name: python3-psycopg2 + state: present + when: ansible_distribution_major_version is version('10', '>') - name: Is nrpe present ? stat: diff --git a/rabbitmq/tasks/nrpe.yml b/rabbitmq/tasks/nrpe.yml index c4c700df..75b37043 100644 --- a/rabbitmq/tasks/nrpe.yml +++ b/rabbitmq/tasks/nrpe.yml @@ -1,9 +1,16 @@ --- -- name: check_rabbitmq dependencies +- name: python-requests is installed (check_rabbitmq dependency) apt: name: python-requests state: present + when: ansible_distribution_major_version is version('10', '<=') + +- name: python3-requests is installed (check_rabbitmq dependency) + apt: + name: python3-requests + state: present + when: ansible_distribution_major_version is version('10', '>') - include_role: name: evolix/remount-usr