Muehlenhoff has submitted this change and it was merged.
Change subject: Only install python-pygeoip on Ubuntu
......................................................................
Only install python-pygeoip on Ubuntu
Not available on jessie and provenance unknown, skip installing for now
to restore puppet runs on notebook*.
Bug: T150003
Change-Id: Icca0a454ea2fd833664ba99a90b1a4acb77a8e67
---
M modules/statistics/manifests/packages.pp
1 file changed, 7 insertions(+), 1 deletion(-)
Approvals:
Ottomata: Looks good to me, but someone else must approve
Muehlenhoff: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/statistics/manifests/packages.pp
b/modules/statistics/manifests/packages.pp
index adb2e65..510a07e 100644
--- a/modules/statistics/manifests/packages.pp
+++ b/modules/statistics/manifests/packages.pp
@@ -55,7 +55,6 @@
'python-pandas', # Pivot tables processing
'python-requests', # Simple lib to make API calls
'python-unidecode', # Unicode simplification - converts everything to
latin set
- 'python-pygeoip', # For geo-encoding IP addresses
'python-ua-parser', # For parsing User Agents
'python-matplotlib', # For generating plots of data
'python-netaddr',
@@ -67,6 +66,13 @@
'python-pymysql',
])
+ # This is a custom package and currently not available on jessie, don't
install on jessie for now
+ if os_version('ubuntu >= trusty') {
+ ensure_packages([
+ 'python-pygeoip', # For geo-encoding IP addresses
+ ])
+ }
+
# FORTRAN packages (T89414)
ensure_packages([
'gfortran', # GNU Fortran 95 compiler
--
To view, visit https://gerrit.wikimedia.org/r/320410
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icca0a454ea2fd833664ba99a90b1a4acb77a8e67
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
