From 437d2986ae9a3d26d3c7dc01726d400c4f076402 Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Wed, 29 Sep 2021 18:39:29 +0200 Subject: [PATCH] better python3 modules management --- mysql-oracle/tasks/users.yml | 14 +++++++++----- mysql/tasks/users_stretch.yml | 14 +++++++++----- postgresql/tasks/nrpe.yml | 2 +- rabbitmq/tasks/nrpe.yml | 2 +- redmine/tasks/packages.yml | 14 +++++++++----- webapps/nextcloud/tasks/main.yml | 14 +++++++++----- 6 files changed, 38 insertions(+), 22 deletions(-) diff --git a/mysql-oracle/tasks/users.yml b/mysql-oracle/tasks/users.yml index e5a7e3da..a34cea7b 100644 --- a/mysql-oracle/tasks/users.yml +++ b/mysql-oracle/tasks/users.yml @@ -1,20 +1,24 @@ --- # dependency for mysql_user and mysql_db -- name: python-mysqldb is installed (Ansible dependency) +- name: python modules is installed (Ansible dependency) apt: - name: python-mysqldb + name: + - python-mysqldb + - python-pymysql state: present when: ansible_distribution_major_version is version('10', '<=') tags: - mysql # dependency for mysql_user and mysql_db -- name: python3-mysqldb is installed (Ansible dependency) +- name: python3 modules is installed (Ansible dependency) apt: - name: python3-mysqldb + name: + - python3-mysqldb + - python3-pymysql state: present - when: ansible_distribution_major_version is version('10', '>') + when: ansible_distribution_major_version is version('10', '>=') tags: - mysql diff --git a/mysql/tasks/users_stretch.yml b/mysql/tasks/users_stretch.yml index 2b9bec6b..00b7a5e6 100644 --- a/mysql/tasks/users_stretch.yml +++ b/mysql/tasks/users_stretch.yml @@ -1,20 +1,24 @@ --- # dependency for mysql_user and mysql_db -- name: python-mysqldb is installed (Ansible dependency) +- name: python modules is installed (Ansible dependency) apt: - name: python-mysqldb + name: + - python-mysqldb + - python-pymysql state: present when: ansible_distribution_major_version is version('10', '<=') tags: - mysql # dependency for mysql_user and mysql_db -- name: python3-mysqldb is installed (Ansible dependency) +- name: python3 modules is installed (Ansible dependency) apt: - name: python3-mysqldb + name: + - python3-mysqldb + - python3-pymysql state: present - when: ansible_distribution_major_version is version('10', '>') + when: ansible_distribution_major_version is version('10', '>=') tags: - mysql diff --git a/postgresql/tasks/nrpe.yml b/postgresql/tasks/nrpe.yml index 9c22e293..825390d6 100644 --- a/postgresql/tasks/nrpe.yml +++ b/postgresql/tasks/nrpe.yml @@ -19,7 +19,7 @@ apt: name: python3-psycopg2 state: present - when: ansible_distribution_major_version is version('10', '>') + 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 75b37043..9af64f19 100644 --- a/rabbitmq/tasks/nrpe.yml +++ b/rabbitmq/tasks/nrpe.yml @@ -10,7 +10,7 @@ apt: name: python3-requests state: present - when: ansible_distribution_major_version is version('10', '>') + when: ansible_distribution_major_version is version('10', '>=') - include_role: name: evolix/remount-usr diff --git a/redmine/tasks/packages.yml b/redmine/tasks/packages.yml index 0c65df44..17f0d4a5 100644 --- a/redmine/tasks/packages.yml +++ b/redmine/tasks/packages.yml @@ -19,19 +19,23 @@ - redmine # dependency for mysql_user and mysql_db -- name: python-mysqldb is installed (Ansible dependency) +- name: python modules is installed (Ansible dependency) apt: - name: python-mysqldb + name: + - python-mysqldb + - python-pymysql state: present when: ansible_distribution_major_version is version('10', '<=') tags: - redmine # dependency for mysql_user and mysql_db -- name: python3-mysqldb is installed (Ansible dependency) +- name: python3 modules is installed (Ansible dependency) apt: - name: python3-mysqldb + name: + - python3-mysqldb + - python3-pymysql state: present - when: ansible_distribution_major_version is version('10', '>') + when: ansible_distribution_major_version is version('10', '>=') tags: - redmine \ No newline at end of file diff --git a/webapps/nextcloud/tasks/main.yml b/webapps/nextcloud/tasks/main.yml index c63291f1..942b385e 100644 --- a/webapps/nextcloud/tasks/main.yml +++ b/webapps/nextcloud/tasks/main.yml @@ -20,20 +20,24 @@ - nextcloud # dependency for mysql_user and mysql_db -- name: python-mysqldb is installed (Ansible dependency) +- name: python modules is installed (Ansible dependency) apt: - name: python-mysqldb + name: + - python-mysqldb + - python-pymysql state: present when: ansible_distribution_major_version is version('10', '<=') tags: - nextcloud # dependency for mysql_user and mysql_db -- name: python3-mysqldb is installed (Ansible dependency) +- name: python3 modules is installed (Ansible dependency) apt: - name: python3-mysqldb + name: + - python3-mysqldb + - python3-pymysql state: present - when: ansible_distribution_major_version is version('10', '>') + when: ansible_distribution_major_version is version('10', '>=') tags: - nextcloud