Elukey has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/386376 )
Change subject: profile::mariadb::misc::eventlogging::database: support mariadb
10.1
......................................................................
profile::mariadb::misc::eventlogging::database: support mariadb 10.1
Bug: T177405
Change-Id: I8b63811da4d30f3e214ecfdc2b60f1d75a1ad16d
---
M modules/profile/manifests/mariadb/misc/eventlogging/database.pp
1 file changed, 7 insertions(+), 0 deletions(-)
Approvals:
Marostegui: Looks good to me, but someone else must approve
Elukey: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/profile/manifests/mariadb/misc/eventlogging/database.pp
b/modules/profile/manifests/mariadb/misc/eventlogging/database.pp
index 27b359e..89fa337 100644
--- a/modules/profile/manifests/mariadb/misc/eventlogging/database.pp
+++ b/modules/profile/manifests/mariadb/misc/eventlogging/database.pp
@@ -37,6 +37,12 @@
class {'::standard': }
class {'::base::firewall': }
+ if os_version('debian >= stretch') {
+ $mariadb_basedir = '/opt/wmf-mariadb101'
+ } else {
+ $mariadb_basedir = '/opt/wmf-mariadb10'
+ }
+
# History context: there used to be a distinction between
# EL master and slaves, namely that only the master was not
# in read only mode. The Analytics team removed this constraint
@@ -44,6 +50,7 @@
# that needed to DELETE/UPDATE rows on the job database without
# running as root for obvious reasons.
class { 'mariadb::config':
+ basedir => $mariadb_basedir,
config =>
'profile/mariadb/misc/eventlogging/eventlogging.my.cnf.erb',
datadir => '/srv/sqldata',
tmpdir => '/srv/tmp',
--
To view, visit https://gerrit.wikimedia.org/r/386376
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8b63811da4d30f3e214ecfdc2b60f1d75a1ad16d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey <[email protected]>
Gerrit-Reviewer: Elukey <[email protected]>
Gerrit-Reviewer: Marostegui <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
