Jcrespo has submitted this change and it was merged.
Change subject: mariadb: implement custom mysqld_safe script to all servers
..
mariadb: implement custom mysqld_safe script to all servers
Enforce it to those that are using the wmf-mariadb or wmf-mariadb10
packages.
Bug: T145378
Change-Id: I204dd59b0569572062c62894546b567297cc9a6f
---
M manifests/role/mariadb.pp
M manifests/site.pp
M modules/mariadb
3 files changed, 3 insertions(+), 27 deletions(-)
Approvals:
Jcrespo: Looks good to me, approved
Marostegui: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index 97e74af..aafa9cc 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -1044,10 +1044,3 @@
ensure => latest,
}
}
-
-# control mysqld_safe with puppet instead of with
-# the mariadb package for flexibility
-class role::mariadb::custom_mysqld_safe {
-
-include mariadb::mysqld_safe
-}
diff --git a/manifests/site.pp b/manifests/site.pp
index 3915a71..4f420fe 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -548,15 +548,7 @@
}
}
-node /^db10(26|45|70|71|87|92)\.eqiad\.wmnet/ {
-class { 'role::mariadb::core':
-shard => 's5',
-}
-}
-
-# temporary definition for mysqld_safe testing
-node 'db1082.eqiad.wmnet' {
-role mariadb::custom_mysqld_safe
+node /^db10(26|45|70|71|82|87|92)\.eqiad\.wmnet/ {
class { 'role::mariadb::core':
shard => 's5',
}
@@ -589,20 +581,11 @@
}
}
-node /^db10(22|23|30|37|85|88|93)\.eqiad\.wmnet/ {
+node /^db10(22|23|30|37|61|85|88|93)\.eqiad\.wmnet/ {
class { 'role::mariadb::core':
shard => 's6',
}
}
-
-# temporary definition for mysqld_safe testing
-node 'db1061.eqiad.wmnet' {
-role mariadb::custom_mysqld_safe
-class { 'role::mariadb::core':
-shard => 's6',
-}
-}
-
# s6 core production dbs on codfw
# codfw master
diff --git a/modules/mariadb b/modules/mariadb
index d8fb107..1b846eb 16
--- a/modules/mariadb
+++ b/modules/mariadb
@@ -1 +1 @@
-Subproject commit d8fb10738df0945260114f51715c059537db4342
+Subproject commit 1b846eb222a81120af0c995df97afd57751b3e04
--
To view, visit https://gerrit.wikimedia.org/r/311682
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I204dd59b0569572062c62894546b567297cc9a6f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo
Gerrit-Reviewer: Jcrespo
Gerrit-Reviewer: Marostegui
Gerrit-Reviewer: Muehlenhoff
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits