From f124c54b0d53442963e89987e6af87173c38d383 Mon Sep 17 00:00:00 2001
From: CVL-GitHub <jupiter.hu@monash.edu>
Date: Thu, 27 Aug 2015 16:51:57 +1000
Subject: [PATCH] 1. Use mariadb in centos7; 2. Add a variable sqlServiceName;
3. Remove mysql_config_file_name
---
roles/mysql/tasks/mysql_client.yml | 10 ++--------
roles/mysql/tasks/mysql_server.yml | 30 ++----------------------------
roles/mysql/vars/CentOS_6.yml | 6 ++++++
roles/mysql/vars/CentOS_7.yml | 9 ++++++---
roles/mysql/vars/Debian_7.yml | 5 +++++
roles/mysql/vars/Debian_8.yml | 5 +++++
6 files changed, 26 insertions(+), 39 deletions(-)
diff --git a/roles/mysql/tasks/mysql_client.yml b/roles/mysql/tasks/mysql_client.yml
index 3c69675b..f8c23a1c 100644
--- a/roles/mysql/tasks/mysql_client.yml
+++ b/roles/mysql/tasks/mysql_client.yml
@@ -1,18 +1,12 @@
---
- name: "Installing MySQL Debian"
apt: name="{{ item }}" update_cache=yes cache_valid_time=3600 state=present
- with_items:
- - python
- - mysql-client
+ with_items: client_packages
sudo: true
when: ansible_os_family == "Debian"
- name: Installing MySQL RedHat
yum: name="{{ item }}" state=latest
- with_items:
- - python
- - mysql
- - mysql-connector-odbc
- - MySQL-python
+ with_items: client_packages
sudo: true
when: ansible_os_family == "RedHat"
diff --git a/roles/mysql/tasks/mysql_server.yml b/roles/mysql/tasks/mysql_server.yml
index 95885ee2..50dcd79a 100644
--- a/roles/mysql/tasks/mysql_server.yml
+++ b/roles/mysql/tasks/mysql_server.yml
@@ -5,22 +5,11 @@
sudo: true
when: ansible_os_family == "Debian"
-- name: "Remove rdo repo"
+- name: "Remove rdo repo, it's broken"
file: path=/etc/yum.repos.d/rdo-release.repo state=absent
sudo: true
when: ansible_os_family == "RedHat" and ansible_distribution_major_version >= 7
-- name: "Check RPM packages"
- shell: ls /etc/yum.repos.d/mysql-community.repo
- register: mysql_repo
- ignore_errors: true
- when: rpm_package is defined
-
-- name: "Add RPM packages"
- shell: rpm -iUvh {{ rpm_package }}
- sudo: true
- when: mysql_repo | failed
-
- name: Installing MySQL RedHat
yum: name={{ item }}
with_items: server_packages
@@ -28,28 +17,13 @@
when: ansible_os_family == "RedHat"
- name: "Starting MySQL"
- service: name=mysql state=started enabled=true
- sudo: true
- when: ansible_os_family == "Debian"
-
-- name: "Starting MySQL"
- service: name=mysqld state=started enabled=true
+ service: name={{ sqlServiceName }} state=started enabled=true
sudo: true
- when: ansible_os_family == "RedHat" and ansible_distribution_major_version < 7
-
-- name: "Starting MySQL"
- service: name=mysqld state=started enabled=true
- sudo: true
- when: ansible_os_family == "RedHat" and ansible_distribution_major_version >= 7
- name: make sure mysql conf directory exists
file: dest=/etc/mysql/conf.d state=directory
sudo: true
-- name: "Templating mysql configure file"
- template: src="mysql.cnf.j2" dest=/etc/mysql/conf.d/mysqld_safe_syslog.cnf owner=root group=root
- sudo: true
-
- name: "Adding root"
sudo: true
mysql_user: name=root host="{{ item }}" password="{{ mysql_root_password }}" login_user=root login_password="{{ mysql_root_password }}" check_implicit_admin=yes
diff --git a/roles/mysql/vars/CentOS_6.yml b/roles/mysql/vars/CentOS_6.yml
index e3bbeaef..544e8a13 100644
--- a/roles/mysql/vars/CentOS_6.yml
+++ b/roles/mysql/vars/CentOS_6.yml
@@ -6,4 +6,10 @@ server_packages:
- MySQL-python
- mysql-server
+client_packages:
+ - python
+ - mysql
+ - mysql-connector-odbc
+ - MySQL-python
+sqlServiceName: mysqld
diff --git a/roles/mysql/vars/CentOS_7.yml b/roles/mysql/vars/CentOS_7.yml
index 524f128c..24834c49 100644
--- a/roles/mysql/vars/CentOS_7.yml
+++ b/roles/mysql/vars/CentOS_7.yml
@@ -1,9 +1,12 @@
-rpm_package: "http://dev.mysql.com/get/mysql-community-release-el7-5.noarch.rpm"
-
server_packages:
- python
- python-devel
- MySQL-python
- - mysql-community-server
+ - mariadb-server
+client_packages:
+ - mariadb
+ - python
+ - MySQL-python
+sqlServiceName: mariadb
diff --git a/roles/mysql/vars/Debian_7.yml b/roles/mysql/vars/Debian_7.yml
index eec16f6a..cc3cfc58 100644
--- a/roles/mysql/vars/Debian_7.yml
+++ b/roles/mysql/vars/Debian_7.yml
@@ -8,3 +8,8 @@ server_packages:
- mysql-server
- python-mysqldb
+client_packages:
+ - python
+ - mysql-client
+
+sqlServiceName: "mysql"
diff --git a/roles/mysql/vars/Debian_8.yml b/roles/mysql/vars/Debian_8.yml
index eec16f6a..cc3cfc58 100644
--- a/roles/mysql/vars/Debian_8.yml
+++ b/roles/mysql/vars/Debian_8.yml
@@ -8,3 +8,8 @@ server_packages:
- mysql-server
- python-mysqldb
+client_packages:
+ - python
+ - mysql-client
+
+sqlServiceName: "mysql"
--
GitLab