Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/403978 )
Change subject: mw-maintenance: move mariadb maintenance to tendril
......................................................................
mw-maintenance: move mariadb maintenance to tendril
As described by jynus on T184797:
The so called "mariadb maintenance" isn't really database
maintenance but just some scripts related to tendril.
Move it out of the Mediawiki maintenance role and servers
as unrelated.
Put into tendril role applied on dbmonitor servers instead.
Adjust Hiera and enable cron in eqiad while disabling it in codfw.
Bug: T184797
Change-Id: I6243444f27c37746b8e3793942d5396b9ddfa9ce
---
M hieradata/role/codfw/mediawiki_maintenance.yaml
A hieradata/role/codfw/tendril.yaml
M hieradata/role/common/mediawiki_maintenance.yaml
A hieradata/role/eqiad/tendril.yaml
M modules/role/manifests/mediawiki_maintenance.pp
M modules/role/manifests/tendril.pp
6 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/78/403978/1
diff --git a/hieradata/role/codfw/mediawiki_maintenance.yaml
b/hieradata/role/codfw/mediawiki_maintenance.yaml
index 2ecbf52..e69de29 100644
--- a/hieradata/role/codfw/mediawiki_maintenance.yaml
+++ b/hieradata/role/codfw/mediawiki_maintenance.yaml
@@ -1 +0,0 @@
-profile::mariadb::maintenance::ensure: absent
diff --git a/hieradata/role/codfw/tendril.yaml
b/hieradata/role/codfw/tendril.yaml
new file mode 100644
index 0000000..2ecbf52
--- /dev/null
+++ b/hieradata/role/codfw/tendril.yaml
@@ -0,0 +1 @@
+profile::mariadb::maintenance::ensure: absent
diff --git a/hieradata/role/common/mediawiki_maintenance.yaml
b/hieradata/role/common/mediawiki_maintenance.yaml
index bc372b3..49b1344 100644
--- a/hieradata/role/common/mediawiki_maintenance.yaml
+++ b/hieradata/role/common/mediawiki_maintenance.yaml
@@ -17,7 +17,6 @@
# Kill queries only after 1 day
read_timeout: 86400000
nutcracker::verbosity: "4"
-profile::mariadb::maintenance::ensure: present
# whitelist maintenance servers from screen monitoring
# many users have permanent sessions here (T165348)
diff --git a/hieradata/role/eqiad/tendril.yaml
b/hieradata/role/eqiad/tendril.yaml
new file mode 100644
index 0000000..70da1d8
--- /dev/null
+++ b/hieradata/role/eqiad/tendril.yaml
@@ -0,0 +1 @@
+profile::mariadb::maintenance::ensure: present
diff --git a/modules/role/manifests/mediawiki_maintenance.pp
b/modules/role/manifests/mediawiki_maintenance.pp
index f7666c4..a2ecf6b 100644
--- a/modules/role/manifests/mediawiki_maintenance.pp
+++ b/modules/role/manifests/mediawiki_maintenance.pp
@@ -6,9 +6,6 @@
include ::role::mediawiki::common
include ::profile::mediawiki::maintenance
- # MariaDB (Tendril)
- include ::profile::mariadb::maintenance
-
# NOC - https://noc.wikimedia.org/
include ::role::noc::site
diff --git a/modules/role/manifests/tendril.pp
b/modules/role/manifests/tendril.pp
index 8a63e00..3ecc1e3 100644
--- a/modules/role/manifests/tendril.pp
+++ b/modules/role/manifests/tendril.pp
@@ -31,6 +31,9 @@
auth_name => 'WMF Labs (use wiki login name not shell) -
nda/ops/wmf',
}
+ # MariaDB (Tendril) maintenance
+ include ::profile::mariadb::maintenance
+
# Make tendril active-passive cross-datacenter until a local db backend is
# available on codfw to avoid cross-dc queries or TLS is used to connect
if hiera('do_acme', true) {
--
To view, visit https://gerrit.wikimedia.org/r/403978
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6243444f27c37746b8e3793942d5396b9ddfa9ce
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
