From b3cd4f36295fca04b0c28dc19497f82ea2ed19f3 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Mon, 31 Aug 2015 10:22:54 -0500 Subject: [PATCH] Fixes #54: Remove Python MySQL from package list. --- tasks/setup-Debian.yml | 3 +++ tasks/setup-RedHat.yml | 3 +++ vars/Debian.yml | 1 - vars/RedHat.yml | 1 - 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml index 8b07af9..f5ae47f 100644 --- a/tasks/setup-Debian.yml +++ b/tasks/setup-Debian.yml @@ -7,6 +7,9 @@ apt: update_cache=yes when: mysql_installed.stat.exists == false +- name: Ensure MySQL Python libraries are installed. + apt: "name=python-mysqldb state=installed" + - name: Ensure MySQL packages are installed. apt: "name={{ item }} state=installed" with_items: mysql_packages diff --git a/tasks/setup-RedHat.yml b/tasks/setup-RedHat.yml index c847b77..0d08201 100644 --- a/tasks/setup-RedHat.yml +++ b/tasks/setup-RedHat.yml @@ -1,4 +1,7 @@ --- +- name: Ensure MySQL Python libraries are installed. + yum: "name=MySQL-python state=installed enablerepo={{ mysql_enablerepo }}" + - name: Ensure MySQL packages are installed. yum: "name={{ item }} state=installed enablerepo={{ mysql_enablerepo }}" with_items: mysql_packages diff --git a/vars/Debian.yml b/vars/Debian.yml index f106049..55c88e8 100644 --- a/vars/Debian.yml +++ b/vars/Debian.yml @@ -3,7 +3,6 @@ __mysql_daemon: mysql __mysql_packages: - mysql-common - mysql-server - - python-mysqldb __mysql_slow_query_log_file: /var/log/mysql/mysql-slow.log mysql_config_file: /etc/mysql/my.cnf mysql_socket: /var/run/mysqld/mysqld.sock diff --git a/vars/RedHat.yml b/vars/RedHat.yml index dbf9db6..cc483d1 100644 --- a/vars/RedHat.yml +++ b/vars/RedHat.yml @@ -3,7 +3,6 @@ __mysql_daemon: mysqld __mysql_packages: - mysql - mysql-server - - MySQL-python __mysql_slow_query_log_file: /var/log/mysql-slow.log mysql_config_file: /etc/my.cnf mysql_socket: /var/lib/mysql/mysql.sock