Merge "Change wait_timeout in MySQL for zabbix node"
This commit is contained in:
commit
a657d71126
|
@ -48,6 +48,7 @@ class mysql::config(
|
||||||
$custom_setup_class = undef,
|
$custom_setup_class = undef,
|
||||||
$server_id = $mysql::params::server_id,
|
$server_id = $mysql::params::server_id,
|
||||||
$debug = $mysql::params::debug,
|
$debug = $mysql::params::debug,
|
||||||
|
$wait_timeout = $mysql::params::wait_timeout,
|
||||||
) inherits mysql::params {
|
) inherits mysql::params {
|
||||||
|
|
||||||
$mysql_buffer_pool_size = $::mysql::params::mysql_buffer_pool_size
|
$mysql_buffer_pool_size = $::mysql::params::mysql_buffer_pool_size
|
||||||
|
@ -56,7 +57,6 @@ class mysql::config(
|
||||||
$table_open_cache = $::mysql::params::table_open_cache
|
$table_open_cache = $::mysql::params::table_open_cache
|
||||||
$key_buffer_size = $::mysql::params::key_buffer_size
|
$key_buffer_size = $::mysql::params::key_buffer_size
|
||||||
$myisam_sort_buffer_size = $::mysql::params::myisam_sort_buffer_size
|
$myisam_sort_buffer_size = $::mysql::params::myisam_sort_buffer_size
|
||||||
$wait_timeout = $::mysql::params::wait_timeout
|
|
||||||
$open_files_limit = $::mysql::params::open_files_limit
|
$open_files_limit = $::mysql::params::open_files_limit
|
||||||
|
|
||||||
if $custom_setup_class != "pacemaker_mysql" {
|
if $custom_setup_class != "pacemaker_mysql" {
|
||||||
|
|
|
@ -39,6 +39,7 @@ class mysql::server (
|
||||||
$etc_root_password = true,
|
$etc_root_password = true,
|
||||||
$bind_address = '0.0.0.0',
|
$bind_address = '0.0.0.0',
|
||||||
$use_syslog = true,
|
$use_syslog = true,
|
||||||
|
$wait_timeout = $mysql::params::wait_timeout,
|
||||||
) inherits mysql::params {
|
) inherits mysql::params {
|
||||||
|
|
||||||
if ($config_hash['config_file']) {
|
if ($config_hash['config_file']) {
|
||||||
|
@ -59,6 +60,7 @@ class mysql::server (
|
||||||
use_syslog => $use_syslog,
|
use_syslog => $use_syslog,
|
||||||
custom_setup_class => $custom_setup_class,
|
custom_setup_class => $custom_setup_class,
|
||||||
config_file => $config_file_real,
|
config_file => $config_file_real,
|
||||||
|
wait_timeout => $wait_timeout,
|
||||||
}
|
}
|
||||||
|
|
||||||
Exec {path => '/usr/bin:/bin:/usr/sbin:/sbin'}
|
Exec {path => '/usr/bin:/bin:/usr/sbin:/sbin'}
|
||||||
|
|
|
@ -12,6 +12,7 @@ class zabbix::db::mysql(
|
||||||
client_package_name => $mysql_client_pkg,
|
client_package_name => $mysql_client_pkg,
|
||||||
package_name => $mysql_server_pkg,
|
package_name => $mysql_server_pkg,
|
||||||
enabled => true,
|
enabled => true,
|
||||||
|
wait_timeout => '86400',
|
||||||
}
|
}
|
||||||
anchor { 'mysql_server_start': } -> Class['mysql::server'] -> anchor { 'mysql_server_end': }
|
anchor { 'mysql_server_start': } -> Class['mysql::server'] -> anchor { 'mysql_server_end': }
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue