Ottomata has submitted this change and it was merged.
Change subject: Manually including geoip::data to ensure that proper
data_directory is created
......................................................................
Manually including geoip::data to ensure that proper data_directory is created
Change-Id: I452b69cb17c64da349cd4c06ae3a8da3a86eafe4
---
M manifests/puppetmaster.pp
1 file changed, 7 insertions(+), 0 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/manifests/puppetmaster.pp b/manifests/puppetmaster.pp
index 57ae714..7ceab0c 100644
--- a/manifests/puppetmaster.pp
+++ b/manifests/puppetmaster.pp
@@ -281,6 +281,13 @@
# data_directory. By downloading these files into the
# volatiledir they will be available for other nodes to get via
# puppet by including geoip with data_provider => 'puppet'.
+
+ # Sigh, need to manually include ::geoip::data here, since we
are
+ # changing data_directory and puppet class inheritance with
parameters
+ # is funky.
+ class { '::geoip::data':
+ data_directory => "${puppetmaster::volatiledir}/GeoIP",
+ }
class { '::geoip':
data_provider => 'maxmind',
data_directory => "${puppetmaster::volatiledir}/GeoIP",
--
To view, visit https://gerrit.wikimedia.org/r/71834
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I452b69cb17c64da349cd4c06ae3a8da3a86eafe4
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
