Merge pull request #3 from singleplatform-eng/Upstream_changes

Upstream changes

Author: wwaltersp

README.md

@@ -58,9 +58,21 @@ A list of files that should override the default global my.cnf. Each item in the
 
 The MySQL databases to create. A database has the values `name`, `encoding` (defaults to `utf8`), `collation` (defaults to `utf8_general_ci`) and `replicate` (defaults to `1`, only used if replication is configured). The formats of these are the same as in the `mysql_db` module.
 
+You can also delete a database (or ensure it's not on the server) by setting `state` to `absent` (defaults to `present`).
+
     mysql_users: []
 
-The MySQL users and their privileges. A user has the values `name`, `host` (defaults to `localhost`), `password`, `priv` (defaults to `*.*:USAGE`), `append_privs` (defaults to `no`),  `state`  (defaults to `present`). The formats of these are the same as in the `mysql_user` module.
+The MySQL users and their privileges. A user has the values:
+
+  - `name`
+  - `host` (defaults to `localhost`)
+  - `password` (can be plaintext or encrypted—if encrypted, set `encrypted: yes`)
+  - `encrypted` (defaults to `no`)
+  - `priv` (defaults to `*.*:USAGE`)
+  - `append_privs` (defaults to `no`)
+  - `state`  (defaults to `present`)
+
+The formats of these are the same as in the `mysql_user` module.
 
     mysql_packages:
       - mysql
@@ -88,6 +100,7 @@ Override this if you want to install older versions of mysql on newer OS release
 
 Default MySQL connection configuration.
 
+    mysql_log_file_group: mysql *adm on Debian*
     mysql_log: ""
     mysql_log_error: *default value depends on OS*
     mysql_syslog_tag: *default value depends on OS*

defaults/main.yml

@@ -49,6 +49,9 @@ mysql_sql_mode: ''
 # mysql_pid_file: /var/run/mysqld/mysqld.pid
 # mysql_socket: /var/lib/mysql/mysql.sock
 
+# Log file settings.
+mysql_log_file_group: mysql
+
 # Slow query log settings.
 mysql_slow_query_log_enabled: no
 mysql_slow_query_time: "2"

tasks/configure.yml

@@ -50,7 +50,7 @@
     path: "{{ mysql_slow_query_log_file }}"
     state: file
     owner: mysql
-    group: mysql
+    group: "{{ mysql_log_file_group }}"
     mode: 0640
   when: mysql_slow_query_log_enabled
 
@@ -66,7 +66,7 @@
     path: "{{ mysql_log_error }}"
     state: file
     owner: mysql
-    group: mysql
+    group: "{{ mysql_log_file_group }}"
     mode: 0640
   when: mysql_log == "" and mysql_log_error != ""
 

tasks/databases.yml

@@ -4,5 +4,5 @@
     name: "{{ item.name }}"
     collation: "{{ item.collation | default('utf8_general_ci') }}"
     encoding: "{{ item.encoding | default('utf8') }}"
-    state: present
+    state: "{{ item.state | default('present') }}"
   with_items: "{{ mysql_databases }}"

tasks/main.yml

@@ -1,19 +1,16 @@
 ---
 # Variable configuration.
-- include: variables.yml
+- include_tasks: variables.yml
 
 # Setup/install tasks.
-- include: setup-RedHat.yml
+- include_tasks: setup-RedHat.yml
   when: ansible_os_family == 'RedHat'
-  static: no
 
-- include: setup-Debian.yml
+- include_tasks: setup-Debian.yml
   when: ansible_os_family == 'Debian'
-  static: no
 
-- include: setup-Archlinux.yml
+- include_tasks: setup-Archlinux.yml
   when: ansible_os_family == 'Archlinux'
-  static: no
 
 - name: Check if MySQL packages were installed.
   set_fact:
@@ -22,8 +19,8 @@
       or (arch_mysql_install_packages is defined and arch_mysql_install_packages.changed) }}"
 
 # Configure MySQL.
-- include: configure.yml
-- include: secure-installation.yml
-- include: databases.yml
-- include: users.yml
-- include: replication.yml
+- include_tasks: configure.yml
+- include_tasks: secure-installation.yml
+- include_tasks: databases.yml
+- include_tasks: users.yml
+- include_tasks: replication.yml

tasks/replication.yml

@@ -27,7 +27,7 @@
   delegate_to: "{{ mysql_replication_master }}"
   register: master
   when: >
-    ((slave.Is_Slave is defined and not slave.Is_Slave) or (slave.Is_Slave is not defined and slave|failed))
+    ((slave.Is_Slave is defined and not slave.Is_Slave) or (slave.Is_Slave is not defined and slave is failed))
     and (mysql_replication_role == 'slave')
     and (mysql_replication_master != '')
 
@@ -41,14 +41,14 @@
     master_log_pos: "{{ master.Position }}"
   ignore_errors: True
   when: >
-    ((slave.Is_Slave is defined and not slave.Is_Slave) or (slave.Is_Slave is not defined and slave|failed))
+    ((slave.Is_Slave is defined and not slave.Is_Slave) or (slave.Is_Slave is not defined and slave is failed))
     and (mysql_replication_role == 'slave')
     and (mysql_replication_master != '')
     and mysql_replication_user
 
 - name: Start replication.
   mysql_replication: mode=startslave
   when: >
-    ((slave.Is_Slave is defined and not slave.Is_Slave) or (slave.Is_Slave is not defined and slave|failed))
+    ((slave.Is_Slave is defined and not slave.Is_Slave) or (slave.Is_Slave is not defined and slave is failed))
     and (mysql_replication_role == 'slave')
     and (mysql_replication_master != '')

tasks/setup-Archlinux.yml

@@ -7,6 +7,6 @@
   with_items: "{{ mysql_packages }}"
   register: arch_mysql_install_packages
 
-# Init the database if mysql is newly installed
-- command: mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
+- name: Run mysql_install_db if MySQL packages were changed.
+  command: mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
   when: arch_mysql_install_packages.changed

tasks/setup-Debian.yml

@@ -29,11 +29,15 @@
   apt: update_cache=yes
   when: mysql_installed.stat.exists == false
 
+- name: Determine required MySQL Python libraries.
+  set_fact:
+    deb_mysql_python_package: "{% if 'python3' in ansible_python_interpreter|default('') %}python3-mysqldb{% else %}python-mysqldb{% endif %}"
+
 - name: Ensure MySQL Python libraries are installed.
-  apt: "name=python-mysqldb state=installed"
+  apt: "name={{ deb_mysql_python_package }} state=present"
 
 - name: Ensure MySQL packages are installed.
-  apt: "name={{ item }} state=installed"
+  apt: "name={{ item }} state=present"
   with_items: "{{ mysql_packages }}"
   register: deb_mysql_install_packages
 

tasks/setup-RedHat.yml

@@ -1,8 +1,8 @@
 ---
 - name: Ensure MySQL packages are installed.
-  yum: "name={{ item }} state=installed enablerepo={{ mysql_enablerepo }}"
+  yum: "name={{ item }} state=present enablerepo={{ mysql_enablerepo }}"
   with_items: "{{ mysql_packages }}"
   register: rh_mysql_install_packages
 
 - name: Ensure MySQL Python libraries are installed.
-  yum: "name=MySQL-python state=installed enablerepo={{ mysql_enablerepo }}"
+  yum: "name=MySQL-python state=present enablerepo={{ mysql_enablerepo }}"

tasks/users.yml

@@ -7,5 +7,6 @@
     priv: "{{ item.priv | default('*.*:USAGE') }}"
     state: "{{ item.state | default('present') }}"
     append_privs: "{{ item.append_privs | default('no') }}"
+    encrypted: "{{ item.encrypted | default('no') }}"
   with_items: "{{ mysql_users }}"
   no_log: true