Ottomata has submitted this change and it was merged.
Change subject: Updating geoip module usage on puppetmaster
......................................................................
Updating geoip module usage on puppetmaster
RT 5411
Change-Id: I47f0ee65fdab8ae62e9ed6d2a2df4735bd8e44f6
---
M manifests/puppetmaster.pp
1 file changed, 4 insertions(+), 3 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/manifests/puppetmaster.pp b/manifests/puppetmaster.pp
index ec20732..8b6b515 100644
--- a/manifests/puppetmaster.pp
+++ b/manifests/puppetmaster.pp
@@ -274,13 +274,14 @@
}
class geoip {
- # Including geoip::data with provider => maxmind will install a
+ # Including geoip with data_provider => maxmind will install a
# cron job to download GeoIP data files from Maxmind weekly.
# Setting data_directory will have those files downloaded into
# data_directory. By downloading these files into the
# volatiledir they will be available for other nodes to get via
- # puppet by including geoip::data with provider => 'puppet'.
- class { 'geoip::data::maxmind':
+ # puppet by including geoip with data_provider => 'puppet'.
+ class { 'geoip':
+ data_provider => 'maxmind',
data_directory => "${puppetmaster::volatiledir}/GeoIP",
environment =>
'http_proxy=http://brewster.wikimedia.org:8080', # use brewster as http proxy,
since puppetmaster probably does not have internet access
license_key => $passwords::geoip::license_key,
--
To view, visit https://gerrit.wikimedia.org/r/71822
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I47f0ee65fdab8ae62e9ed6d2a2df4735bd8e44f6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
