Jcrespo has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/361841 )
Change subject: labsdb-replica: Change default basedir to the 10.1 package
......................................................................
labsdb-replica: Change default basedir to the 10.1 package
Also change socket hardcoded to the wrong, but current place:
/tmp/mysql.sock
Bug: T168356
Change-Id: Ic170d4e00828577fd8a0ea80acba29a03a537a7e
---
M modules/mariadb/manifests/service.pp
M modules/role/manifests/labs/db/replica.pp
M modules/role/manifests/mariadb/sanitarium2.pp
3 files changed, 8 insertions(+), 4 deletions(-)
Approvals:
jenkins-bot: Verified
Jcrespo: Looks good to me, approved
diff --git a/modules/mariadb/manifests/service.pp
b/modules/mariadb/manifests/service.pp
index 00a775d..7368295 100644
--- a/modules/mariadb/manifests/service.pp
+++ b/modules/mariadb/manifests/service.pp
@@ -15,13 +15,13 @@
class mariadb::service (
$package = 'wmf-mariadb10',
- $basedir = undef,
+ $basedir = '',
$manage = false,
$ensure = stopped,
$enable = false,
) {
- if $basedir == undef {
+ if $basedir == '' {
$initd_basedir = "/opt/${package}"
} else {
$initd_basedir = $basedir
diff --git a/modules/role/manifests/labs/db/replica.pp
b/modules/role/manifests/labs/db/replica.pp
index 2b11f02..a94ba3b 100644
--- a/modules/role/manifests/labs/db/replica.pp
+++ b/modules/role/manifests/labs/db/replica.pp
@@ -41,7 +41,9 @@
class { 'mariadb::config':
config =>
'role/mariadb/mysqld_config/labsdb-replica.my.cnf.erb',
+ basedir => '/opt/wmf-mariadb101',
datadir => '/srv/sqldata',
+ socket => '/tmp/mysql.sock',
tmpdir => '/srv/tmp',
read_only => 'ON',
p_s => 'on',
diff --git a/modules/role/manifests/mariadb/sanitarium2.pp
b/modules/role/manifests/mariadb/sanitarium2.pp
index 158f015..37b1adda 100644
--- a/modules/role/manifests/mariadb/sanitarium2.pp
+++ b/modules/role/manifests/mariadb/sanitarium2.pp
@@ -30,8 +30,10 @@
}
class { 'mariadb::config':
- config => 'role/mariadb/mysqld_config/sanitarium2.my.cnf.erb',
- ssl => 'puppet-cert',
+ basedir => '/opt/wmf-mariadb101',
+ socket => '/tmp/mysql.sock',
+ config => 'role/mariadb/mysqld_config/sanitarium2.my.cnf.erb',
+ ssl => 'puppet-cert',
}
class {'mariadb::service':
--
To view, visit https://gerrit.wikimedia.org/r/361841
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic170d4e00828577fd8a0ea80acba29a03a537a7e
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo <[email protected]>
Gerrit-Reviewer: Jcrespo <[email protected]>
Gerrit-Reviewer: Marostegui <[email protected]>
Gerrit-Reviewer: Volans <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
