Merge pull request geerlingguy#134 from geerlingguy/revert-132-master

Revert "Allow RedHat-7 variables to be overridden."

Author: geerlingguy

tasks/main.yml

@@ -23,21 +23,6 @@
     mysql_slow_query_log_file: "{{ __mysql_slow_query_log_file }}"
   when: mysql_slow_query_log_file is not defined
 
-- name: Define mysql_log_error.
-  set_fact:
-    mysql_log_error: "{{ __mysql_log_error }}"
-  when: mysql_log_error is not defined
-
-- name: Define mysql_syslog_tag.
-  set_fact:
-    mysql_syslog_tag: "{{ __mysql_syslog_tag }}"
-  when: mysql_syslog_tag is not defined
-
-- name: Define mysql_pid_file.
-  set_fact:
-    mysql_pid_file: "{{ __mysql_pid_file }}"
-  when: mysql_pid_file is not defined
-
 # Setup/install tasks.
 - include: setup-RedHat.yml
   when: ansible_os_family == 'RedHat'

vars/RedHat-7.yml

@@ -7,9 +7,9 @@ __mysql_packages:
   - 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_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