Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/93714
Change subject: geoip: s/misc::geoip/geoip/
......................................................................
geoip: s/misc::geoip/geoip/
Remove the misc::geoip class in favor of the new overhauled geoip class.
This is a no-op for production but it does change labs significantly, as
labs instances will now sync all databases via puppet, instead of using
the Debian package (this means up-to-date databases too, though!)
Change-Id: I4080cef4e1378debf95df3c7db5d23f1468c9f0e
---
D manifests/misc/geoip.pp
M manifests/misc/statistics.pp
M manifests/role/analytics.pp
M manifests/role/applicationserver.pp
M manifests/role/cache.pp
M manifests/role/logging.pp
M manifests/role/statistics.pp
7 files changed, 7 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/14/93714/1
diff --git a/manifests/misc/geoip.pp b/manifests/misc/geoip.pp
deleted file mode 100644
index 19d6d26..0000000
--- a/manifests/misc/geoip.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-# == Class misc::geoip
-# Installs MaxMind geoip packages and data files.
-# This uses the geoip module to sync .dat files
-# from puppetmaster from puppet:///volatile/GeoIP.
-#
-# TODO: How should we move this out of misc/ into another
-# location. This isn't a role, but I don't want to reference $::realm
-# in the geoip module itself. What to do? hmmm hooo...
-#
-class misc::geoip {
- if ($::realm == 'production') {
- include geoip::data::puppet
- } else {
- include geoip::data::package
- }
-}
diff --git a/manifests/misc/statistics.pp b/manifests/misc/statistics.pp
index a478e87..ee67c09 100644
--- a/manifests/misc/statistics.pp
+++ b/manifests/misc/statistics.pp
@@ -871,7 +871,7 @@
misc::statistics::geowiki::mysql::conf::research,
passwords::mysql::globaldev,
misc::statistics::packages::python,
- misc::geoip
+ geoip
$geowiki_user = $misc::statistics::geowiki::geowiki_user
$geowiki_path = $misc::statistics::geowiki::geowiki_path
diff --git a/manifests/role/analytics.pp b/manifests/role/analytics.pp
index 25bfa53..ad61965 100644
--- a/manifests/role/analytics.pp
+++ b/manifests/role/analytics.pp
@@ -35,7 +35,7 @@
role::analytics::sqoop
# We want to be able to geolocate IP addresses
- include misc::geoip
+ include geoip
# udp-filter is a useful thing!
include misc::udp2log::udp_filter
# include dclass for device classification
diff --git a/manifests/role/applicationserver.pp
b/manifests/role/applicationserver.pp
index bd2eb36..36695b7 100644
--- a/manifests/role/applicationserver.pp
+++ b/manifests/role/applicationserver.pp
@@ -54,7 +54,7 @@
if $::realm == 'production' {
include admins::roots,
admins::mortals,
- misc::geoip,
+ geoip,
mediawiki
nrpe::monitor_service { "twemproxy":
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 3685a2f..53d6ee0 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -918,7 +918,7 @@
system::role { "role::cache::bits": description => "bits
Varnish cache server" }
- require misc::geoip
+ require geoip
include standard,
nrpe
diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp
index fe9619a..941d351 100644
--- a/manifests/role/logging.pp
+++ b/manifests/role/logging.pp
@@ -34,7 +34,7 @@
groups::wikidev,
admins::restricted,
nrpe,
- misc::geoip
+ geoip
}
# mediawiki udp2log instance. Does not use monitoring.
diff --git a/manifests/role/statistics.pp b/manifests/role/statistics.pp
index 347be9f..419c264 100644
--- a/manifests/role/statistics.pp
+++ b/manifests/role/statistics.pp
@@ -13,7 +13,7 @@
system::role { "role::statistics": description => "statistics number
crunching server" }
# include classes needed for crunching data on stat1.
- include misc::geoip,
+ include geoip,
misc::statistics::dataset_mount,
misc::statistics::mediawiki,
misc::statistics::plotting,
@@ -52,7 +52,7 @@
system::role { "role::statistics": description => "statistics private
data host" }
# include classes needed for crunching private data on stat1002
- include misc::geoip,
+ include geoip,
misc::statistics::dataset_mount,
misc::statistics::mediawiki,
misc::statistics::plotting,
--
To view, visit https://gerrit.wikimedia.org/r/93714
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4080cef4e1378debf95df3c7db5d23f1468c9f0e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
