Springle has submitted this change and it was merged.
Change subject: Class for wmf-mariadb build, versions 5.5 and 10.0. Roll out
5.5.36 on db1044.
......................................................................
Class for wmf-mariadb build, versions 5.5 and 10.0.
Roll out 5.5.36 on db1044.
Change-Id: I7d00c6b6b26ed6aa547f988b68fee5f5ff1a5284
---
M manifests/role/mariadb.pp
M modules/mariadb/manifests/packages.pp
A modules/mariadb/manifests/packages_wmf.pp
3 files changed, 37 insertions(+), 3 deletions(-)
Approvals:
Springle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index 0c47890..63a0e00 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -42,7 +42,7 @@
description => 'tendril database server',
}
- include mariadb::packages
+ include mariadb::packages_wmf
include passwords::misc::scripts
class { 'mariadb::config':
diff --git a/modules/mariadb/manifests/packages.pp
b/modules/mariadb/manifests/packages.pp
index 92cd0ec..11b79e7 100644
--- a/modules/mariadb/manifests/packages.pp
+++ b/modules/mariadb/manifests/packages.pp
@@ -1,5 +1,5 @@
-# MariaDB 5.5 debs
-# Keep this independent and modular. It should be includable without the
mariadb class.
+# MariaDB 5.5 debs -- slightly modified .debs from MariaDB.org.
+# Eventually these should probably just be upstream Debian packages by default.
class mariadb::packages {
diff --git a/modules/mariadb/manifests/packages_wmf.pp
b/modules/mariadb/manifests/packages_wmf.pp
new file mode 100644
index 0000000..098f52a
--- /dev/null
+++ b/modules/mariadb/manifests/packages_wmf.pp
@@ -0,0 +1,34 @@
+# MariaDB WMF patched build installed in /opt.
+# Unless you're setting up a production server, you probably want vanilla
mariadb::packages
+
+class mariadb::packages_wmf(
+ $mariadb10 = false,
+ ) {
+
+ package { [
+ 'labaio1',
+ 'libmysqlclient18',
+ 'mysql-client-5.5',
+ 'percona-toolkit',
+ 'percona-xtrabackup',
+ ]:
+ ensure => present,
+ }
+
+ if ($mariadb10 == true) {
+
+ package { [
+ 'wmf-mariadb10',
+ ]:
+ ensure => present,
+ }
+ }
+ else {
+
+ package { [
+ 'wmf-mariadb',
+ ]:
+ ensure => present,
+ }
+ }
+}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/122643
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7d00c6b6b26ed6aa547f988b68fee5f5ff1a5284
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle <sprin...@wikimedia.org>
Gerrit-Reviewer: Springle <sprin...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
