Dzahn has submitted this change and it was merged. Change subject: deprecated syntax in mysql/generic_my.cnf.erb ......................................................................
deprecated syntax in mysql/generic_my.cnf.erb https://projects.puppetlabs.com/issues/19058 Change-Id: I9cb052e8ad84700c43c2e65e8b3410bb1448787d --- M templates/mysql/generic_my.cnf.erb 1 file changed, 60 insertions(+), 60 deletions(-) Approvals: Springle: Looks good to me, but someone else must approve Alexandros Kosiaris: Looks good to me, approved jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/templates/mysql/generic_my.cnf.erb b/templates/mysql/generic_my.cnf.erb index 0b6de64..07020fe 100644 --- a/templates/mysql/generic_my.cnf.erb +++ b/templates/mysql/generic_my.cnf.erb @@ -10,11 +10,11 @@ [mysqld] -basedir = <%= basedir %> -datadir = <%= datadir %> -tmpdir = <%= tmpdir %> -socket = <%= socket_path %> -pid-file = <%= pid_path %> +basedir = <%= @basedir %> +datadir = <%= @datadir %> +tmpdir = <%= @tmpdir %> +socket = <%= @socket_path %> +pid-file = <%= @pid_path %> user = mysql @@ -22,24 +22,24 @@ # Networking # ############## -bind_address = <%= bind_address %> -port = <%= port %> +bind_address = <%= @bind_address %> +port = <%= @port %> skip_name_resolve -max_allowed_packet = <%= max_allowed_packet %> -max_connections = <%= max_connections %> -wait_timeout = <%= wait_timeout %> -connect_timeout = <%= connect_timeout %> +max_allowed_packet = <%= @max_allowed_packet %> +max_connections = <%= @max_connections %> +wait_timeout = <%= @wait_timeout %> +connect_timeout = <%= @connect_timeout %> ########### # Logging # ########### -log_error = <%= log_error %> +log_error = <%= @log_error %> <% if slow_query_log_file -%> slow_query_log = 1 -slow_query_log_file = <%= slow_query_log_file %> -long_query_time = <%= long_query_time %> +slow_query_log_file = <%= @slow_query_log_file %> +long_query_time = <%= @long_query_time %> <% end -%> # Character Set @@ -59,49 +59,49 @@ # define. Defaults for these are # set in the mysql_instance define -%> -tmp_table_size = <%= tmp_table_size %> -max_heap_table_size = <%= max_heap_table_size %> -max_tmp_tables = <%= max_tmp_tables %> +tmp_table_size = <%= @tmp_table_size %> +max_heap_table_size = <%= @max_heap_table_size %> +max_tmp_tables = <%= @max_tmp_tables %> -join_buffer_size = <%= join_buffer_size %> -read_buffer_size = <%= read_buffer_size %> -sort_buffer_size = <%= sort_buffer_size %> +join_buffer_size = <%= @join_buffer_size %> +read_buffer_size = <%= @read_buffer_size %> +sort_buffer_size = <%= @sort_buffer_size %> -table_cache = <%= table_cache %> -table_definition_cache = <%= table_definition_cache %> -open_files_limit = <%= open_files_limit %> +table_cache = <%= @table_cache %> +table_definition_cache = <%= @table_definition_cache %> +open_files_limit = <%= @open_files_limit %> -thread_stack = <%= thread_stack %> -thread_cache_size = <%= thread_cache_size %> -thread_concurrency = <%= thread_concurrency %> +thread_stack = <%= @thread_stack %> +thread_cache_size = <%= @thread_cache_size %> +thread_concurrency = <%= @thread_concurrency %> -query_cache_size = <%= query_cache_size %> -query_cache_limit = <%= query_cache_limit %> -tmp_table_size = <%= tmp_table_size %> -read_rnd_buffer_size = <%= read_rnd_buffer_size %> +query_cache_size = <%= @query_cache_size %> +query_cache_limit = <%= @query_cache_limit %> +tmp_table_size = <%= @tmp_table_size %> +read_rnd_buffer_size = <%= @read_rnd_buffer_size %> ################### # MyISAM Settings # ################### -key_buffer_size = <%= key_buffer_size %> -myisam_sort_buffer_size = <%= myisam_sort_buffer_size %> -myisam_max_sort_file_size = <%= myisam_max_sort_file_size %> +key_buffer_size = <%= @key_buffer_size %> +myisam_sort_buffer_size = <%= @myisam_sort_buffer_size %> +myisam_max_sort_file_size = <%= @myisam_max_sort_file_size %> ################### # InnoDB Settings # ################### -innodb_file_per_table = <%= innodb_file_per_table %> -innodb_status_file = <%= innodb_status_file %> -innodb_support_xa = <%= innodb_support_xa %> -innodb_flush_log_at_trx_commit = <%= innodb_flush_log_at_trx_commit %> -innodb_buffer_pool_size = <%= innodb_buffer_pool_size %> -innodb_log_file_size = <%= innodb_log_file_size %> -innodb_log_group_home_dir = <%= datadir %> -innodb_flush_method = <%= innodb_flush_method %> -innodb_thread_concurrency = <%= innodb_thread_concurrency %> -innodb_concurrency_tickets = <%= innodb_concurrency_tickets %> -innodb_doublewrite = <%= innodb_doublewrite %> +innodb_file_per_table = <%= @innodb_file_per_table %> +innodb_status_file = <%= @innodb_status_file %> +innodb_support_xa = <%= @innodb_support_xa %> +innodb_flush_log_at_trx_commit = <%= @innodb_flush_log_at_trx_commit %> +innodb_buffer_pool_size = <%= @innodb_buffer_pool_size %> +innodb_log_file_size = <%= @innodb_log_file_size %> +innodb_log_group_home_dir = <%= @datadir %> +innodb_flush_method = <%= @innodb_flush_method %> +innodb_thread_concurrency = <%= @innodb_thread_concurrency %> +innodb_concurrency_tickets = <%= @innodb_concurrency_tickets %> +innodb_doublewrite = <%= @innodb_doublewrite %> # always enable federated storage engine federated = 1 @@ -111,38 +111,38 @@ ######################## # Replication Settings # ######################## -log_bin = <%= bindir %>/bin -relay-log = <%= bindir %>/relay-bin -relay-log-index = <%= bindir %>/relay-bin.index -expire_logs_days = <%= expire_logs_days %> +log_bin = <%= @bindir %>/bin +relay-log = <%= @bindir %>/relay-bin +relay-log-index = <%= @bindir %>/relay-bin.index +expire_logs_days = <%= @expire_logs_days %> # Log slave updates so that any machine may be a master log_slave_updates -# report as <%= hostname + '.' + port %> to master -report-host=<%= hostname + '.' + port %> +# report as <%= @hostname + '.' + @port %> to master +report-host=<%= @hostname + '.' + @port %> <% #automatically generate a unique master server-id from IP -%> <% ia = ipaddress.split('.'); server_id = ia[0] + ia[2] + ia[3]; -%> -server-id = <%= server_id %> +server-id = <%= @server_id %> <% replicate_ignore_db.each do |db| -%> -replicate_ignore_db = <%= db %> +replicate_ignore_db = <%= @db %> <% end -%> <% replicate_ignore_table.each do |table| -%> -replicate_ignore_table = <%= table %> +replicate_ignore_table = <%= @table %> <% end -%> <% replicate_do_db.each do |db| -%> -replicate_do_db = <%= db %> +replicate_do_db = <%= @db %> <% end -%> <% replicate_do_table.each do |table| -%> -replicate_do_table = <%= table %> +replicate_do_table = <%= @table %> <% end -%> <% end # if replication_enabled -%> <% # set read_only mode based on read_only variable -%> -read_only = <%= read_only ? 1 : 0 %> +read_only = <%= @read_only ? 1 : 0 %> <% # render out any extra_configs as key = value pairs -%> <% extra_configs.each do |key, value| -%> @@ -154,13 +154,13 @@ # escpecially if they contain "#" chars... # Remember to edit /etc/mysql/debian.cnf when changing the socket location. [client] -port = <%= port %> -socket = <%= socket_path %> +port = <%= @port %> +socket = <%= @socket_path %> [mysqldump] quick quote-names -max_allowed_packet = <%= max_allowed_packet %> +max_allowed_packet = <%= @max_allowed_packet %> [mysql] #no-auto-rehash # faster start of mysql but no tab completition @@ -169,4 +169,4 @@ # * IMPORTANT: Additional settings that can override those from this file! # The files must end with '.cnf', otherwise they'll be ignored. # -!includedir /etc/mysql/conf.d/ \ No newline at end of file +!includedir /etc/mysql/conf.d/ -- To view, visit https://gerrit.wikimedia.org/r/143529 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9cb052e8ad84700c43c2e65e8b3410bb1448787d Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <[email protected]> Gerrit-Reviewer: Alexandros Kosiaris <[email protected]> Gerrit-Reviewer: Dzahn <[email protected]> Gerrit-Reviewer: Matanya <[email protected]> Gerrit-Reviewer: Springle <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
