mariadb server config utilization

- allow overriding of some common config options

Change-Id: Ie832477216df5c1b0b94d75ba1ee6cc1bf968219

attributes/mysql.rb

@@ -50,3 +50,9 @@ default['openstack']['mysql']['character-set-server'] = 'latin1'
 default['openstack']['mysql']['query_cache_size'] = '0'
 # Maximum number of connections
 default['openstack']['mysql']['max_connections'] = 307
+# Increased connect timeout to give services time to warm up
+default['openstack']['mysql']['connect_timeout'] = 30
+# Default wait timeout
+default['openstack']['mysql']['wait_timeout'] = 600
+# Default temp directory
+default['openstack']['mysql']['tmpdir'] = '/var/tmp'

metadata.rb

@@ -3,7 +3,7 @@ maintainer       'openstack-chef'
 maintainer_email 'openstack-discuss@lists.openstack.org'
 license          'Apache-2.0'
 description      'Provides the shared database configuration for OpenStack'
-version          '19.2.0'
+version          '19.3.0'
 
 %w(ubuntu redhat centos).each do |os|
   supports os

recipes/mariadb-server.rb

@@ -59,8 +59,9 @@ mariadb_server_configuration 'default' do
     innodb_flush_log_at_trx_commit: node['openstack']['mysql']['innodb_flush_log_at_trx_commit']
   )
   mysqld_bind_address listen_address
-  # increase the default from 5 seconds to allow extra time for services to warm up
-  mysqld_connect_timeout 30
+  mysqld_connect_timeout node['openstack']['mysql']['connect_timeout']
+  mysqld_wait_timeout node['openstack']['mysql']['wait_timeout']
+  mysqld_tmpdir node['openstack']['mysql']['tmpdir']
   mysqld_default_storage_engine node['openstack']['mysql']['default-storage-engine']
   mysqld_max_connections node['openstack']['mysql']['max_connections']
   mysqld_query_cache_size node['openstack']['mysql']['query_cache_size']

spec/mariadb-server_spec.rb

@@ -39,6 +39,8 @@ describe 'openstack-ops-database::mariadb-server' do
         },
         mysqld_bind_address: '127.0.0.1',
         mysqld_connect_timeout: 30,
+        mysqld_wait_timeout: 600,
+        mysqld_tmpdir: '/var/tmp',
         mysqld_default_storage_engine: 'InnoDB',
         mysqld_max_connections: 307,
         mysqld_query_cache_size: '0',