Faidon Liambotis has submitted this change and it was merged.
Change subject: puppetmaster: fixup for geoip changes
......................................................................
puppetmaster: fixup for geoip changes
Remove the geoip-database Package resource as it's being redefined. The
whole geoip class is messy and hard to follow, subsequent commits to
clean up will follow.
Change-Id: I82dfc2dd4ec4e4ff934582fbfc2b0f9ff5260444
---
M modules/puppetmaster/manifests/geoip.pp
1 file changed, 0 insertions(+), 4 deletions(-)
Approvals:
Faidon Liambotis: Verified; Looks good to me, approved
diff --git a/modules/puppetmaster/manifests/geoip.pp
b/modules/puppetmaster/manifests/geoip.pp
index 665aab5..b77a3e0 100644
--- a/modules/puppetmaster/manifests/geoip.pp
+++ b/modules/puppetmaster/manifests/geoip.pp
@@ -6,10 +6,6 @@
$geoip_destdir = "${puppetmaster::volatiledir}/GeoIP"
$environment = 'http_proxy=http://brewster.wikimedia.org:8080'
- package { 'geoip-database':
- ensure => absent,
- }
-
# installs the geoip-bin package
class { '::geoip':
data_provider => undef,
--
To view, visit https://gerrit.wikimedia.org/r/93685
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I82dfc2dd4ec4e4ff934582fbfc2b0f9ff5260444
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
