Faidon Liambotis has submitted this change and it was merged.
Change subject: puppetmaster: another fixup for geoip
......................................................................
puppetmaster: another fixup for geoip
The geoip's inheritance logic is fundamentally broken and the directory
ensures would never work like this. ensure the directory present in the
puppetmaster class, as that's the right place for this anyway.
Change-Id: Ic2fd4679ada38a4cdc31396505bee88f109e3f73
---
M modules/puppetmaster/manifests/geoip.pp
1 file changed, 5 insertions(+), 0 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/puppetmaster/manifests/geoip.pp
b/modules/puppetmaster/manifests/geoip.pp
index b77a3e0..e6b086f 100644
--- a/modules/puppetmaster/manifests/geoip.pp
+++ b/modules/puppetmaster/manifests/geoip.pp
@@ -6,6 +6,11 @@
$geoip_destdir = "${puppetmaster::volatiledir}/GeoIP"
$environment = 'http_proxy=http://brewster.wikimedia.org:8080'
+ # geoip::data classes depend on this
+ file { $geoip_destdir:
+ ensure => directory,
+ }
+
# installs the geoip-bin package
class { '::geoip':
data_provider => undef,
--
To view, visit https://gerrit.wikimedia.org/r/93688
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic2fd4679ada38a4cdc31396505bee88f109e3f73
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
