Fix problems with new CentOS 7 MariaDB fixes.

Author: geerlingguy

README.md

@@ -99,12 +99,9 @@ Replication settings. Set `mysql_server_id` and `mysql_replication_role` by serv
 
 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.
 
+#### Ubuntu 14.04 and 16.04 MariaDB configuration
 
-#### 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):
+On Ubuntu, the package names are named differently, so the `mysql_package` variable needs to be altered. Set the following variables (at a minimum):
 
     mysql_packages:
       - mariadb-client

tasks/configure.yml

@@ -40,10 +40,6 @@
     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).

tasks/main.yml

@@ -2,17 +2,12 @@
 # Include variables and define needed variables.
 - name: Include OS-specific variables.
   include_vars: "{{ ansible_os_family }}.yml"
-  when: ansible_os_family  != "RedHat"
+  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 version-specific variables for RedHat.
+- name: Include OS-specific variables (RedHat).
   include_vars: "{{ ansible_os_family }}-{{ ansible_lsb.major_release }}.yml"
-  when:  ansible_os_family >= "7"
+  when: ansible_os_family == "RedHat"
 
 - name: Define mysql_packages.
   set_fact: