Jcrespo has uploaded a new change for review.
https://gerrit.wikimedia.org/r/253316
Change subject: Explicit all mariadb versions for 5.5 vs 10
......................................................................
Explicit all mariadb versions for 5.5 vs 10
This is needed in order to change the default on the module to
be mariadb10.
Change-Id: I852b2bdec1994aea4bcb8f3084be4c0bb968dfe8
---
M manifests/role/labsdb.pp
M manifests/role/mariadb.pp
2 files changed, 6 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/16/253316/1
diff --git a/manifests/role/labsdb.pp b/manifests/role/labsdb.pp
index 647129c..c8924fa 100644
--- a/manifests/role/labsdb.pp
+++ b/manifests/role/labsdb.pp
@@ -7,7 +7,9 @@
}
include standard
- include mariadb::packages_wmf
+ class { 'mariadb::packages_wmf':
+ mariadb10 => false
+ }
include role::mariadb::grants
include role::mariadb::monitor
diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index 844fb2d..edd89ae 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -140,7 +140,9 @@
}
include standard
- include mariadb::packages_wmf
+ class { 'mariadb::packages_wmf':
+ mariadb10 => !$master,
+ }
include role::mariadb::monitor
include passwords::misc::scripts
include role::mariadb::ferm
--
To view, visit https://gerrit.wikimedia.org/r/253316
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I852b2bdec1994aea4bcb8f3084be4c0bb968dfe8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo <jcre...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
