Jcrespo has uploaded a new change for review.
https://gerrit.wikimedia.org/r/316566
Change subject: Add mariadb::service selectively, only on single-instance dbs
......................................................................
Add mariadb::service selectively, only on single-instance dbs
Also assume mariadb10 is the default, no need to explicitly
indicate we do not want 5.5.
Change-Id: I7fe9a648881613ceb491dec2fe07e4053db4228e
---
M manifests/role/mariadb.pp
M modules/mariadb
2 files changed, 19 insertions(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/66/316566/1
diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index ad181c2..477701a 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -229,6 +229,7 @@
class { 'mariadb::packages_wmf':
mariadb10 => true,
}
+ include mariadb::service
class { 'mariadb::config':
config => 'mariadb/misc.my.cnf.erb',
@@ -377,9 +378,8 @@
mysql_role => $mysql_role,
}
- class { 'mariadb::packages_wmf':
- mariadb10 => true,
- }
+ include mariadb::packages_wmf
+ include mariadb::service
$read_only = $master ? {
true => 0,
@@ -419,6 +419,7 @@
include standard
include mariadb::packages_wmf
+ include mariadb::service
include passwords::misc::scripts
# This is essentially the same volume created by role::labs::lvm::srv but
@@ -452,9 +453,8 @@
description => 'tendril database server',
}
- class { 'mariadb::packages_wmf':
- mariadb10 => true,
- }
+ include mariadb::packages_wmf
+ include mariadb::service
include standard
include role::mariadb::monitor::dba
@@ -484,9 +484,8 @@
description => 'Delayed Slave',
}
- class { 'mariadb::packages_wmf':
- mariadb10 => true,
- }
+ include mariadb::packages_wmf
+ include mariadb::service
include standard
include passwords::misc::scripts
@@ -641,9 +640,8 @@
}
- class { 'mariadb::packages_wmf':
- mariadb10 => true,
- }
+ include mariadb::packages_wmf
+ include mariadb::service
# Semi-sync replication
# off: for non-primary datacenter and read-only shard(s)
@@ -708,9 +706,8 @@
mysql_role => 'slave',
}
- class { 'mariadb::packages_wmf':
- mariadb10 => true,
- }
+ include mariadb::packages_wmf
+ # do not add mariadb::service, multi-instance has its own way
class { 'mariadb::config':
config => 'mariadb/sanitarium.my.cnf.erb',
@@ -802,9 +799,8 @@
mysql_role => 'slave',
}
- class { 'mariadb::packages_wmf':
- mariadb10 => true,
- }
+ include mariadb::packages_wmf
+ include mariadb::service
class { 'mariadb::config':
config => 'mariadb/labs.my.cnf.erb',
@@ -852,9 +848,8 @@
mysql_role => 'standalone',
}
- class { 'mariadb::packages_wmf':
- mariadb10 => true,
- }
+ include mariadb::packages_wmf
+ include mariadb::service
class { 'mariadb::config':
config => 'mariadb/wikitech.my.cnf.erb',
@@ -966,9 +961,8 @@
description => "Parser Cache Database ${shard}",
}
- class { 'mariadb::packages_wmf':
- mariadb10 => true,
- }
+ include mariadb::packages_wmf
+ include mariadb::service
include role::mariadb::grants::core
class { 'role::mariadb::grants::production':
diff --git a/modules/mariadb b/modules/mariadb
index 4ec6ebd..a639204 160000
--- a/modules/mariadb
+++ b/modules/mariadb
@@ -1 +1 @@
-Subproject commit 4ec6ebda64d1737c13d30ef3ddc0509d0ca1329a
+Subproject commit a6392048b98875ae19a51a1551877569bf1f9e3b
--
To view, visit https://gerrit.wikimedia.org/r/316566
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7fe9a648881613ceb491dec2fe07e4053db4228e
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
