From 01abbcaca324fbaf2c858aaa9ccae81fd3265157 Mon Sep 17 00:00:00 2001
From: David Glaser <dsglaser@med.umich.edu>
Date: Wed, 6 Apr 2016 09:34:28 -0400
Subject: [PATCH 1/3] Adapted for RHEL 7:

Separated RedHat.yml files into RedHat 6 and RedHat 7 files

Adapted main.yml to point to the correct file
---
 tasks/main.yml                    | 11 +++++++++++
 vars/{RedHat.yml => RedHat-6.yml} |  0
 vars/RedHat-7.yml                 | 15 +++++++++++++++
 3 files changed, 26 insertions(+)
 rename vars/{RedHat.yml => RedHat-6.yml} (100%)
 create mode 100644 vars/RedHat-7.yml

diff --git a/tasks/main.yml b/tasks/main.yml
index cc33cb3..beb6cc6 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -2,6 +2,17 @@
 # Include variables and define needed variables.
 - name: Include OS-specific variables.
   include_vars: "{{ ansible_os_family }}.yml"
+  when: ansible_os_family  != "RedHat"
+
+# Include RedHat 6 variables (mysql)
+- name: Include OS-specific variables.
+  include_vars: "{{ ansible_os_family }}-{{ ansible_lsb.major_release }}.yml"
+  when: ansible_lsb.major_release < "7"
+
+# Include RedHat 7 variables (mariadb)
+- name: Include OS-specific variables.
+  include_vars: "{{ ansible_os_family }}-{{ ansible_lsb.major_release }}.yml"
+  when:  ansible_os_family >= "7"
 
 - name: Define mysql_packages.
   set_fact:
diff --git a/vars/RedHat.yml b/vars/RedHat-6.yml
similarity index 100%
rename from vars/RedHat.yml
rename to vars/RedHat-6.yml
diff --git a/vars/RedHat-7.yml b/vars/RedHat-7.yml
new file mode 100644
index 0000000..0cf3922
--- /dev/null
+++ b/vars/RedHat-7.yml
@@ -0,0 +1,15 @@
+---
+__mysql_daemon: mariadb
+__mysql_packages:
+  - mariadb
+  - mariadb-server
+  - mariadb-libs
+  - MySQL-python
+  - perl-DBD-MySQL
+__mysql_slow_query_log_file: /var/log/mysql-slow.log
+mysql_log_error: /var/log/mariadb/mariadb.log
+mysql_syslog_tag: mariadb
+mysql_pid_file: /var/run/mariadb/mariadb.pid
+mysql_config_file: /etc/my.cnf
+mysql_config_include_dir: /etc/my.cnf.d
+mysql_socket: /var/lib/mysql/mysql.sock

From 64a7b7357a94f061df54bee6346b060d09c7ed99 Mon Sep 17 00:00:00 2001
From: David Glaser <dsglaser@med.umich.edu>
Date: Wed, 6 Apr 2016 09:38:18 -0400
Subject: [PATCH 2/3] Updated README for RHEL 7

---
 README.md | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 1ae338a..838ae8f 100644
--- a/README.md
+++ b/README.md
@@ -97,25 +97,13 @@ Replication settings. Set `mysql_server_id` and `mysql_replication_role` by serv
 
 ### MariaDB usage
 
-This role works with either MySQL or a compatible version of MariaDB. On RHEL/CentOS 7+, the mariadb database engine was substituted as the default MySQL replacement package, so you should override the `mysql_packages` variable with the below configuration to make sure MariaDB is installed correctly.
+This role works with either MySQL or a compatible version of MariaDB. On RHEL/CentOS 7+, the mariadb database engine was substituted as the default MySQL replacement package. No modifications are necessary though all of the variables still reference 'mysql' instead of mariadb.
 
-#### RHEL/CentOS 7 MariaDB configuration
-
-Set the following variables (at a minimum):
-
-    mysql_packages:
-      - mariadb
-      - mariadb-server
-      - mariadb-libs
-      - MySQL-python
-      - perl-DBD-MySQL
-    mysql_daemon: mariadb
-    mysql_log_error: /var/log/mariadb/mariadb.log
-    mysql_syslog_tag: mariadb
-    mysql_pid_file: /var/run/mariadb/mariadb.pid
 
 #### Ubuntu 14.04 MariaDB configuration
 
+On Ubuntu, the package names are named differently, so the `mysql_package` variabl needs to be altered
+
 Set the following variables (at a minimum):
 
     mysql_packages:

From 1e75c2f3e3274ba8b457a1eda90dfaec109cc723 Mon Sep 17 00:00:00 2001
From: David Glaser <dsglaser@med.umich.edu>
Date: Wed, 6 Apr 2016 10:45:04 -0400
Subject: [PATCH 3/3] Verify that datadir has been created and selinux context
 set. Currently selinux context set separately because I'm not sure that
 Ubuntu has it installed in all cases.

---
 tasks/configure.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/tasks/configure.yml b/tasks/configure.yml
index 65ebcc1..ad5ec4c 100644
--- a/tasks/configure.yml
+++ b/tasks/configure.yml
@@ -33,6 +33,19 @@
   file: "path={{ mysql_slow_query_log_file }} state=touch"
   when: mysql_slow_query_log_enabled
 
+- name: Create datadir if it does not exist
+  file:
+    path: "{{ mysql_datadir }}"
+    state: directory
+    owner: mysql
+    group: mysql
+    mode:  0755
+  
+- name: Set selinux context on datadir
+  file:
+    path: "{{ mysql_datadir }}"
+    setype: mysqld_db_t
+
 - name: Set ownership on slow query log file (if configured).
   file:
     path: "{{ mysql_slow_query_log_file }}"