Jcrespo has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/364476 )
Change subject: dbstore_multiiinstance: Set default basedir depending on the os
......................................................................
dbstore_multiiinstance: Set default basedir depending on the os
Stretch will default to 10.1, others will default to 10.
Bug: T169514
Change-Id: Ie37ab9826039885597f98b3b0ab8e8153ca2a17e
---
M modules/role/manifests/mariadb/dbstore_multiinstance.pp
M modules/role/templates/mariadb/mysqld_config/dbstore3.my.cnf.erb
2 files changed, 7 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Jcrespo: Looks good to me, approved
diff --git a/modules/role/manifests/mariadb/dbstore_multiinstance.pp
b/modules/role/manifests/mariadb/dbstore_multiinstance.pp
index 1c823c9..269d28d 100644
--- a/modules/role/manifests/mariadb/dbstore_multiinstance.pp
+++ b/modules/role/manifests/mariadb/dbstore_multiinstance.pp
@@ -23,8 +23,14 @@
override => "[Service]\nLimitNOFILE=200000",
}
+ if os_version('debian >= stretch') {
+ $basedir = '/opt/wmf-mariadb101'
+ } else {
+ $basedir = '/opt/wmf-mariadb10'
+ }
# Read only forced on also for the masters of the primary datacenter
class { 'mariadb::config':
+ basedir => $basedir,
config => 'role/mariadb/mysqld_config/dbstore3.my.cnf.erb',
p_s => 'on',
ssl => 'puppet-cert',
diff --git a/modules/role/templates/mariadb/mysqld_config/dbstore3.my.cnf.erb
b/modules/role/templates/mariadb/mysqld_config/dbstore3.my.cnf.erb
index 142376d..23e95eb 100644
--- a/modules/role/templates/mariadb/mysqld_config/dbstore3.my.cnf.erb
+++ b/modules/role/templates/mariadb/mysqld_config/dbstore3.my.cnf.erb
@@ -4,7 +4,7 @@
[client]
port = 3306
-socket = /tmp/mysql.sock
+socket = /run/mysqld/mysqld.sock
<% if @ssl == 'on' or @ssl == 'puppet-cert' %>
# ssl
ssl-ca=/etc/ssl/certs/Puppet_Internal_CA.pem
--
To view, visit https://gerrit.wikimedia.org/r/364476
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie37ab9826039885597f98b3b0ab8e8153ca2a17e
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo <[email protected]>
Gerrit-Reviewer: Jcrespo <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
