Merge branch 'master' into 'master'

Master

See merge request ansible-roles/mysql!1

templates/etc-mysql-my-cnf

@@ -62,6 +62,12 @@ innodb_flush_log_at_trx_commit = {{ mysql_innodb_flush_log_at_trx_commit }}
 innodb_log_file_size = {{ mysql_innodb_log_file_size }}
 innodb_strict_mode = {{ mysql_innodb_strict_mode }}
 join_buffer_size = {{ mysql_join_buffer_size }}
+{% if mysql_innodb_io_capacity is defined %}
+innodb_io_capacity = {{ mysql_innodb_io_capacity }}
+{% endif %}
+{% if mysql_innodb_io_capacity_max is defined %}
+innodb_io_capacity_max = {{ mysql_innodb_io_capacity_max }}
+{% endif %}
 # This replaces the startup script and checks MyISAM tables if needed
 # the first time they are touched
 myisam-recover = BACKUP

templates/etc-mysql-mysql-conf-d-mysqld.cnf

@@ -50,6 +50,12 @@ join_buffer_size   = {{ mysql_join_buffer_size }}
 max_allowed_packet = {{ mysql_max_allowed_packet }}
 thread_stack       = 192K
 thread_cache_size  = {{ mysql_thread_cache_size }}
+{% if mysql_innodb_io_capacity is defined %}
+innodb_io_capacity = {{ mysql_innodb_io_capacity }}
+{% endif %}
+{% if mysql_innodb_io_capacity_max is defined %}
+innodb_io_capacity_max = {{ mysql_innodb_io_capacity_max }}
+{% endif %}
 # This replaces the startup script and checks MyISAM tables if needed
 # the first time they are touched
 myisam-recover-options  = BACKUP