diff --git a/mysql/tasks/packages_jessie.yml b/mysql/tasks/packages_jessie.yml index 48408433..652eace7 100644 --- a/mysql/tasks/packages_jessie.yml +++ b/mysql/tasks/packages_jessie.yml @@ -50,3 +50,11 @@ tags: - mysql - packages + +- name: Python dependencies for Ansible are installed + apt: + name: python-mysqldb + state: present + tags: + - mysql + - packages diff --git a/mysql/tasks/packages_stretch.yml b/mysql/tasks/packages_stretch.yml index 98a8f69d..880f5050 100644 --- a/mysql/tasks/packages_stretch.yml +++ b/mysql/tasks/packages_stretch.yml @@ -36,3 +36,25 @@ tags: - mysql - packages + +- name: Python2 dependencies for Ansible are installed + apt: + name: + - python-mysqldb + - python-pymysql + state: present + tags: + - mysql + - packages + when: ansible_python_version is version('3', '<') + +- name: Python3 dependencies for Ansible are installed + apt: + name: + - python3-mysqldb + - python3-pymysql + state: present + tags: + - mysql + - packages + when: ansible_python_version is version('3', '>=') \ No newline at end of file diff --git a/mysql/tasks/users_buster.yml b/mysql/tasks/users_buster.yml index 18b5d98d..dc7cec85 100644 --- a/mysql/tasks/users_buster.yml +++ b/mysql/tasks/users_buster.yml @@ -1,25 +1,5 @@ --- -- name: Python2 dependencies for Ansible are installed - apt: - name: - - python-mysqldb - - python-pymysql - state: present - tags: - - mysql - when: ansible_python_version is version('3', '<') - -- name: Python3 dependencies for Ansible are installed - apt: - name: - - python3-mysqldb - - python3-pymysql - state: present - tags: - - mysql - when: ansible_python_version is version('3', '>=') - - name: create a password for mysqladmin command: "apg -n 1 -m 16 -M lcN" register: mysql_admin_password diff --git a/mysql/tasks/users_jessie.yml b/mysql/tasks/users_jessie.yml index d9cab42f..e2b066b1 100644 --- a/mysql/tasks/users_jessie.yml +++ b/mysql/tasks/users_jessie.yml @@ -5,13 +5,6 @@ msg: "We can't create other users with 'debian-sys-maint' on Debian 8 with MariaDB.\nWe must give it the GRANT privilege before continuing." when: mysql_variant == "mariadb" -- name: Python dependencies for Ansible are installed - apt: - name: python-mysqldb - state: present - tags: - - mysql - - name: create a password for mysqladmin command: "apg -n 1 -m 16 -M lcN" register: mysql_admin_password