Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/143529
Change subject: deprecated syntax in mysql/generic_my.cnf.erb
......................................................................
deprecated syntax in mysql/generic_my.cnf.erb
Change-Id: I9cb052e8ad84700c43c2e65e8b3410bb1448787d
---
M modules/nginx
M modules/wikimetrics
M templates/mysql/generic_my.cnf.erb
3 files changed, 60 insertions(+), 60 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/29/143529/1
diff --git a/modules/nginx b/modules/nginx
index a8b4cd0..14f4943 160000
--- a/modules/nginx
+++ b/modules/nginx
-Subproject commit a8b4cd0b5238ac9430854c6aebf00f1970bd3a0e
+Subproject commit 14f494346e4c9ecd2633684d2d18497ada6479b9
diff --git a/modules/wikimetrics b/modules/wikimetrics
index 9e184d8..3c9e50a 160000
--- a/modules/wikimetrics
+++ b/modules/wikimetrics
-Subproject commit 9e184d86c58ac602906b1150384f9c2646be5d61
+Subproject commit 3c9e50a453be49e4ef5949baa5a8339d7275e95a
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: newchange
Gerrit-Change-Id: I9cb052e8ad84700c43c2e65e8b3410bb1448787d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
