merge upstream master

Author: Colin Hoglund

.travis.yml

@@ -1,59 +1,55 @@
 ---
-sudo: required
+services: docker
 
 env:
-  - distribution: centos
-    version: 6
+  - distro: centos7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    playbook: centos-7-test.yml
+  - distro: centos6
     init: /sbin/init
     run_opts: ""
     playbook: test.yml
-  - distribution: centos
-    version: 7
-    init: /usr/lib/systemd/systemd
+  - distro: ubuntu1604
+    init: /lib/systemd/systemd
     run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-    playbook: centos-7-test.yml
-  - distribution: ubuntu
-    version: 14.04
+    playbook: test.yml
+  - distro: ubuntu1404
     init: /sbin/init
     run_opts: ""
     playbook: test.yml
-  # - distribution: ubuntu
-  #   version: 12.04
-  #   init: /sbin/init
-  #   run_opts: ""
-  #   playbook: test.yml
 
 services:
   - docker
 
 before_install:
   # Pull container
-  - 'sudo docker pull ${distribution}:${version}'
-  # Customize container
-  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
   - container_id=$(mktemp)
-    # Run container in detached state
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+  # Run container in detached state.
+  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
 
   # Ansible syntax check.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} --syntax-check'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} --syntax-check'
 
   # Test role.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook}'
+  - 'docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook}'
 
   # Test role idempotence.
+  - idempotence=$(mktemp)
+  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} | tee -a ${idempotence}
   - >
-    sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook}
+    tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
     && (echo 'Idempotence test: pass' && exit 0)
     || (echo 'Idempotence test: fail' && exit 1)
 
   # Some MySQL debugging (show all the logs).
-  - sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ls -lah /var/log
-  - sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm cat /var/log/mysql/error.log || true
-  - sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm cat /var/log/mysql.err || true
+  - docker exec --tty "$(cat ${container_id})" env TERM=xterm ls -lah /var/log
+  - docker exec --tty "$(cat ${container_id})" env TERM=xterm cat /var/log/mysql/error.log || true
+  - docker exec --tty "$(cat ${container_id})" env TERM=xterm cat /var/log/mysql.err || true
 
   # Check to make sure we can connect to MySQL via Unix socket.
   - >
@@ -69,8 +65,11 @@ script:
     && (echo 'MySQL running normally' && exit 0)
     || (echo 'MySQL not running' && exit 1)
 
-  # Clean up
-  - sudo docker stop "$(cat ${container_id})"
+after_failure:
+  # Check MySQL settings.
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm cat /var/log/mysql/error.log'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm cat /var/log/mysql.err'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm cat /var/log/mysql.log'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/

README.md

@@ -35,6 +35,11 @@ Whether to force update the MySQL root user's password. By default, this role wi
 
 Whether MySQL should be enabled on startup.
 
+    mysql_config_file: *default value depends on OS*
+    mysql_config_include_dir: *default value depends on OS*
+
+The main my.cnf configuration file and include directory.
+
     overwrite_global_mycnf: yes
 
 Whether the global my.cnf should be overwritten each time this role is run. Setting this to `no` tells Ansible to only create the `my.cnf` file if it doesn't exist. This should be left at its default value (`yes`) if you'd like to use this role's variables to configure MySQL.
@@ -64,17 +69,19 @@ The MySQL users and their privileges. A user has the values `name`, `host` (defa
     mysql_port: "3306"
     mysql_bind_address: '0.0.0.0'
     mysql_datadir: /var/lib/mysql
+    mysql_socket: *default value depends on OS*
+    mysql_pid_file: *default value depends on OS*
 
 Default MySQL connection configuration.
 
     mysql_log: ""
-    mysql_log_error: /var/log/mysqld.log
-    mysql_syslog_tag: mysqld
+    mysql_log_error: *default value depends on OS*
+    mysql_syslog_tag: *default value depends on OS*
 
 MySQL logging configuration. Setting `mysql_log` (the general query log) or `mysql_log_error` to `syslog` will make MySQL log to syslog using the `mysql_syslog_tag`.
 
     mysql_slow_query_log_enabled: no
-    mysql_slow_query_log_file: /var/log/mysql-slow.log
+    mysql_slow_query_log_file: *default value depends on OS*
     mysql_slow_query_time: 2
 
 Slow query log settings. Note that the log file will be created by this role, but if you're running on a server with SELinux or AppArmor, you may need to add this path to the allowed paths for MySQL, or disable the mysql profile. For example, on Debian/Ubuntu, you can run `sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/usr.sbin.mysqld && sudo service apparmor restart`.
@@ -84,10 +91,11 @@ Slow query log settings. Note that the log file will be created by this role, bu
     mysql_table_open_cache: "256"
     [...]
 
-The rest of the settings in `defaults/main.yml` control MySQL's memory usage. The default values are tuned for a server where MySQL can consume ~512 MB RAM, so you should consider adjusting them to suit your particular server better.
+The rest of the settings in `defaults/main.yml` control MySQL's memory usage and some other common settings. The default values are tuned for a server where MySQL can consume ~512 MB RAM, so you should consider adjusting them to suit your particular server better.
 
     mysql_server_id: "1"
     mysql_max_binlog_size: "100M"
+    mysql_binlog_format: "ROW"
     mysql_expire_logs_days: "10"
     mysql_replication_role: ''
     mysql_replication_master: ''
@@ -140,4 +148,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).

defaults/main.yml

@@ -11,6 +11,10 @@ mysql_enabled_on_startup: yes
 # update my.cnf. each time role is run? yes | no
 overwrite_global_mycnf: yes
 
+# The following variables have a default value depending on operating system.
+# mysql_config_file: /etc/my.cnf
+# mysql_config_include_dir: /etc/my.cnf.d
+
 # Pass in a comma-separated list of repos to use (e.g. "remi,epel"). Used only
 # for RedHat systems (and derivatives).
 mysql_enablerepo: ""
@@ -25,14 +29,17 @@ mysql_enablerepo: ""
 # MySQL connection settings.
 mysql_port: "3306"
 mysql_bind_address: '0.0.0.0'
-mysql_datadir: /var/lib/mysql
-mysql_pid_file: /var/run/mysqld/mysqld.pid
 mysql_skip_name_resolve: no
+mysql_datadir: /var/lib/mysql
+# The following variables have a default value depending on operating system.
+# mysql_pid_file: /var/run/mysqld/mysqld.pid
+# mysql_socket: /var/lib/mysql/mysql.sock
 
 # Slow query log settings.
 mysql_slow_query_log_enabled: no
-mysql_slow_query_log_file: /var/log/mysql-slow.log
-mysql_slow_query_time: 2
+mysql_slow_query_time: "2"
+# The following variable has a default value depending on operating system.
+# mysql_slow_query_log_file: /var/log/mysql-slow.log
 
 # Memory settings (default values optimized ~512MB RAM).
 mysql_key_buffer_size: "256M"
@@ -44,28 +51,37 @@ mysql_read_rnd_buffer_size: "4M"
 mysql_myisam_sort_buffer_size: "64M"
 mysql_thread_cache_size: "8"
 mysql_query_cache_size: "16M"
-mysql_max_connections: 151
+mysql_query_cache_limit: "1M"
+mysql_max_connections: "151"
+mysql_tmp_table_size: "16M"
+mysql_max_heap_table_size: "16M"
 
 # Other settings.
-mysql_wait_timeout: 28800
+mysql_lower_case_table_names: "0"
+mysql_wait_timeout: "28800"
 
 # InnoDB settings.
-# Set .._buffer_pool_size up to 80% of RAM but beware of setting too high.
 mysql_innodb_file_per_table: "1"
+# Set .._buffer_pool_size up to 80% of RAM but beware of setting too high.
 mysql_innodb_buffer_pool_size: "256M"
 # Set .._log_file_size to 25% of buffer pool size.
 mysql_innodb_log_file_size: "64M"
 mysql_innodb_log_buffer_size: "8M"
 mysql_innodb_flush_log_at_trx_commit: "1"
-mysql_innodb_lock_wait_timeout: 50
+mysql_innodb_lock_wait_timeout: "50"
+
+# These settings require MySQL > 5.5.
+mysql_innodb_large_prefix: "1"
+mysql_innodb_file_format: "barracuda"
 
 # mysqldump settings.
 mysql_mysqldump_max_allowed_packet: "64M"
 
 # Logging settings.
 mysql_log: ""
-mysql_log_error: /var/log/mysql.err
-mysql_syslog_tag: mysql
+# The following variables have a default value depending on operating system.
+# mysql_log_error: /var/log/mysql.err
+# mysql_syslog_tag: mysql
 
 mysql_config_include_files: []
 #  - src: path/relative/to/playbook/file.cnf
@@ -88,6 +104,7 @@ mysql_users: []
 # Replication settings (replication is only enabled if master/user have values).
 mysql_server_id: "1"
 mysql_max_binlog_size: "100M"
+mysql_binlog_format: "ROW"
 mysql_expire_logs_days: "10"
 mysql_replication_role: ''
 mysql_replication_master: ''

tasks/main.yml

@@ -1,34 +1,15 @@
 ---
 # Variable configuration.
-- name: Include OS-specific variables.
-  include_vars: "{{ ansible_os_family }}.yml"
-  when: ansible_os_family != "RedHat"
-
-- name: Include OS-specific variables (RedHat).
-  include_vars: "{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml"
-  when: ansible_os_family == "RedHat"
-
-- name: Define mysql_packages.
-  set_fact:
-    mysql_packages: "{{ __mysql_packages | list }}"
-  when: mysql_packages is not defined
-
-- name: Define mysql_daemon.
-  set_fact:
-    mysql_daemon: "{{ __mysql_daemon }}"
-  when: mysql_daemon is not defined
-
-- name: Define mysql_slow_query_log_file.
-  set_fact:
-    mysql_slow_query_log_file: "{{ __mysql_slow_query_log_file }}"
-  when: mysql_slow_query_log_file is not defined
+- include: variables.yml
 
 # Setup/install tasks.
 - include: setup-RedHat.yml
   when: ansible_os_family == 'RedHat'
+  static: no
 
 - include: setup-Debian.yml
   when: ansible_os_family == 'Debian'
+  static: no
 
 - name: Check if MySQL packages were installed.
   set_fact:

tasks/replication.yml

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

tasks/secure-installation.yml

@@ -23,15 +23,15 @@
   shell: >
     mysql -u root -NBe
     'ALTER USER "{{ mysql_root_username }}"@"{{ item }}" IDENTIFIED WITH mysql_native_password BY "{{ mysql_root_password }}";'
-  with_items: "{{ mysql_root_hosts.stdout_lines | default([]) }}"
+  with_items: "{{ mysql_root_hosts.stdout_lines|default([]) }}"
   when: ((mysql_install_packages | bool) or mysql_root_password_update) and ('5.7.' in mysql_cli_version.stdout)
 
 # Set root password for MySQL < 5.7.x.
 - name: Update MySQL root password for localhost root account (< 5.7.x).
   shell: >
     mysql -u root -NBe
     'SET PASSWORD FOR "{{ mysql_root_username }}"@"{{ item }}" = PASSWORD("{{ mysql_root_password }}");'
-  with_items: "{{ mysql_root_hosts.stdout_lines | default([]) }}"
+  with_items: "{{ mysql_root_hosts.stdout_lines|default([]) }}"
   when: ((mysql_install_packages | bool) or mysql_root_password_update) and ('5.7.' not in mysql_cli_version.stdout)
 
 # Has to be after the root password assignment, for idempotency.
@@ -54,7 +54,7 @@
      name: ""
      host: "{{ item }}"
      state: absent
-  with_items: "{{ mysql_anonymous_hosts.stdout_lines | default([]) }}"
+  with_items: "{{ mysql_anonymous_hosts.stdout_lines|default([]) }}"
 
 - name: Remove MySQL test database.
   mysql_db: "name='test' state=absent"

tasks/variables.yml

@@ -0,0 +1,59 @@
+---
+# Variable configuration.
+- name: Include OS-specific variables.
+  include_vars: "{{ ansible_os_family }}.yml"
+  when: ansible_os_family != "RedHat"
+
+- name: Include OS-specific variables (RedHat).
+  include_vars: "{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml"
+  when: ansible_os_family == "RedHat"
+
+- name: Define mysql_packages.
+  set_fact:
+    mysql_packages: "{{ __mysql_packages | list }}"
+  when: mysql_packages is not defined
+
+- name: Define mysql_daemon.
+  set_fact:
+    mysql_daemon: "{{ __mysql_daemon }}"
+  when: mysql_daemon is not defined
+
+- name: Define mysql_slow_query_log_file.
+  set_fact:
+    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
+
+- name: Define mysql_config_file.
+  set_fact:
+    mysql_config_file: "{{ __mysql_config_file }}"
+  when: mysql_config_file is not defined
+
+- name: Define mysql_config_include_dir.
+  set_fact:
+    mysql_config_include_dir: "{{ __mysql_config_include_dir }}"
+  when: mysql_config_include_dir is not defined
+
+- name: Define mysql_socket.
+  set_fact:
+    mysql_socket: "{{ __mysql_socket }}"
+  when: mysql_socket is not defined
+
+- name: Define mysql_supports_innodb_large_prefix.
+  set_fact:
+    mysql_supports_innodb_large_prefix: "{{ __mysql_supports_innodb_large_prefix }}"
+  when: mysql_supports_innodb_large_prefix is not defined