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] 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