Jcrespo has uploaded a new change for review.
https://gerrit.wikimedia.org/r/250428
Change subject: Cleaning up config, setting dbs to install mariadb10 by default
......................................................................
Cleaning up config, setting dbs to install mariadb10 by default
(instead of mariadb 5.5)
All servers except labsdb1005 are in 10 already, make that the
default.
Change-Id: Ie6124d47cea3bf7f1aecfda81e5a81c5d2552621
---
M manifests/role/analytics/mysql.pp
M manifests/role/labsdb.pp
M manifests/role/mariadb.pp
M modules/mariadb
4 files changed, 16 insertions(+), 46 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/28/250428/1
diff --git a/manifests/role/analytics/mysql.pp
b/manifests/role/analytics/mysql.pp
index 1c4bb05..b05c25a 100644
--- a/manifests/role/analytics/mysql.pp
+++ b/manifests/role/analytics/mysql.pp
@@ -2,9 +2,8 @@
# Installs a MySQL/MariaDB server for use with Hive and Oozie
#
class role::analytics::mysql::meta {
- class { 'mariadb::packages_wmf':
- mariadb10 => true
- }
+ include mariadb::packages_wmf
+
# This will be included once analytics1015 has been productionized
# - otto 2015-09-15
# include role::mariadb::monitor
diff --git a/manifests/role/labsdb.pp b/manifests/role/labsdb.pp
index 647129c..0870743 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, # remove this on upgrade
+ }
include role::mariadb::grants
include role::mariadb::monitor
@@ -28,9 +30,7 @@
}
include standard
- class { 'mariadb::packages_wmf':
- mariadb10 => true
- }
+ include mariadb::packages_wmf
include role::mariadb::grants
include role::mariadb::monitor
include role::mariadb::ferm
diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index 5cb54d8..183773b 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -107,10 +107,7 @@
include role::mariadb::monitor
include passwords::misc::scripts
include role::mariadb::ferm
-
- class { 'mariadb::packages_wmf':
- mariadb10 => true,
- }
+ include mariadb::packages_wmf
class { 'mariadb::config':
prompt => "MISC ${shard}",
@@ -206,10 +203,7 @@
include standard
include role::mariadb::monitor::dba
include passwords::misc::scripts
-
- class { 'mariadb::packages_wmf':
- mariadb10 => true,
- }
+ include mariadb::packages_wmf
$read_only = $master ? {
true => 'off',
@@ -258,10 +252,7 @@
description => 'tendril database server',
}
- class { 'mariadb::packages_wmf':
- mariadb10 => true,
- }
-
+ include mariadb::packages_wmf
include standard
include role::mariadb::grants
include role::mariadb::monitor::dba
@@ -287,10 +278,7 @@
description => 'Delayed Slave',
}
- class { 'mariadb::packages_wmf':
- mariadb10 => true,
- }
-
+ include mariadb::packages_wmf
include standard
include role::mariadb::grants
include role::mariadb::monitor::dba
@@ -329,10 +317,7 @@
description => 'Analytics All-Shards Slave',
}
- class { 'mariadb::packages_wmf':
- mariadb10 => true,
- }
-
+ include mariadb::packages_wmf
include standard
include role::mariadb::grants
include role::mariadb::monitor
@@ -432,10 +417,7 @@
include role::mariadb::monitor
include passwords::misc::scripts
include role::mariadb::ferm
-
- class { 'mariadb::packages_wmf':
- mariadb10 => true,
- }
+ include mariadb::packages_wmf
class { 'mariadb::config':
prompt => "PRODUCTION ${shard}",
@@ -460,10 +442,7 @@
include standard
include role::mariadb::grants
include passwords::misc::scripts
-
- class { 'mariadb::packages_wmf':
- mariadb10 => true,
- }
+ include mariadb::packages_wmf
class { 'mariadb::config':
prompt => "SANITARIUM",
@@ -552,10 +531,7 @@
include passwords::misc::scripts
include role::mariadb::ferm
include base::firewall
-
- class { 'mariadb::packages_wmf':
- mariadb10 => true,
- }
+ include mariadb::packages_wmf
class { 'mariadb::config':
prompt => "LABS",
@@ -601,10 +577,7 @@
include role::mariadb::grants::wikitech
include role::mariadb::monitor
include passwords::misc::scripts
-
- class { 'mariadb::packages_wmf':
- mariadb10 => true,
- }
+ include mariadb::packages_wmf
class { 'mariadb::config':
prompt => "WIKITECH",
@@ -706,9 +679,7 @@
description => 'Parser Cache DB Server',
}
- class { 'mariadb::packages_wmf':
- mariadb10 => true,
- }
+ include mariadb::packages_wmf
class { 'role::mariadb::grants':
shard => 'parsercache',
diff --git a/modules/mariadb b/modules/mariadb
index 197be6a..cec131f 160000
--- a/modules/mariadb
+++ b/modules/mariadb
-Subproject commit 197be6ad6a0f34b75a4279c8a656f2813ba8712b
+Subproject commit cec131f83f704159f139d6e69f62f4b8fd8498ed
--
To view, visit https://gerrit.wikimedia.org/r/250428
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie6124d47cea3bf7f1aecfda81e5a81c5d2552621
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
