Jcrespo has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/353015 )
Change subject: Enble puppet on db2062- a one-time experiment for mariadb 10.1
......................................................................
Enble puppet on db2062- a one-time experiment for mariadb 10.1
db2062 was experimentally upgraded to 10.1. It was going to be
a temporary test, so puppet was disabled. As there is no bandwidth
to either continue testing, supporting it, or reverting the change,
make a horrible hard-coded exception, aiming for proper support
in the future, which is part of T148507.
Bug: T116557
Change-Id: Ia9ab2884234d193d996baa960a78c81b209d7fa3
---
M modules/role/manifests/mariadb/core.pp
1 file changed, 15 insertions(+), 3 deletions(-)
Approvals:
jenkins-bot: Verified
Jcrespo: Looks good to me, approved
diff --git a/modules/role/manifests/mariadb/core.pp
b/modules/role/manifests/mariadb/core.pp
index d441f95..545ba88 100644
--- a/modules/role/manifests/mariadb/core.pp
+++ b/modules/role/manifests/mariadb/core.pp
@@ -36,9 +36,21 @@
mysql_role => $mysql_role,
}
-
- include mariadb::packages_wmf
- include mariadb::service
+ # FIXME: Get package, socket, datadir, etc. from hiera
+ # FIXME: Support multiple instances per host
+ # db2062 is a one-time test of MariaDB 10.1, which doesn't have yet
+ # proper support (see T148507 & T116557)
+ if ($::hostname == 'db2062') {
+ class {'mariadb::packages_wmf':
+ package => 'wmf-mariadb101',
+ }
+ class {'mariadb::service':
+ package => 'wmf-mariadb101',
+ }
+ } else {
+ include mariadb::packages_wmf
+ include mariadb::service
+ }
# Read only forced on also for the masters of the primary datacenter
class { 'mariadb::config':
--
To view, visit https://gerrit.wikimedia.org/r/353015
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia9ab2884234d193d996baa960a78c81b209d7fa3
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Jcrespo <[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
