Dzahn has submitted this change and it was merged.
Change subject: mw:maintenance: move python-mysqldb from nodes to role
......................................................................
mw:maintenance: move python-mysqldb from nodes to role
Instead of installing packages directly on the node level (meh),
and repeating it for the equivalent in codfw, move this package
install into the role class for mw maintenance hosts.
Also reopened T84075 to check if we still need this at all since
it was called a temporary solution. Not a problem to keep though
if we use it.
Bug:T84075
Bug:129930
Change-Id: I3529298c4427d8ba72dc36688e17237b2182c00f
---
M manifests/site.pp
M modules/role/manifests/mediawiki/maintenance.pp
2 files changed, 3 insertions(+), 8 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 4e3a124..ee31d12 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2079,10 +2079,6 @@
include ldap::role::client::labs
- package { 'python-mysqldb':
- ensure => installed,
- }
-
backup::set {'home': }
}
@@ -2558,10 +2554,6 @@
role mariadb::maintenance, mediawiki::maintenance, backup::host
include ldap::role::client::labs
-
- package { 'python-mysqldb':
- ensure => installed,
- }
backup::set {'home': }
diff --git a/modules/role/manifests/mediawiki/maintenance.pp
b/modules/role/manifests/mediawiki/maintenance.pp
index ff2f438..57e23ac 100644
--- a/modules/role/manifests/mediawiki/maintenance.pp
+++ b/modules/role/manifests/mediawiki/maintenance.pp
@@ -31,4 +31,7 @@
# Readline support for PHP maintenance scripts (T126262)
require_package('php5-readline')
+
+ # T84075 - SUL audit / legoktm
+ require_package('python-mysqldb')
}
--
To view, visit https://gerrit.wikimedia.org/r/279637
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3529298c4427d8ba72dc36688e17237b2182c00f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
