ArielGlenn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/397773 )
Change subject: snapshots only have one nfs filesystem mounted, remove cruft
......................................................................
snapshots only have one nfs filesystem mounted, remove cruft
This includes making the varnames of various paths nicer.
Change-Id: I9f65167f39e4391c10d2ace16cf8ff65a7c52f91
---
M modules/profile/manifests/dumps/generation/worker/common.pp
M modules/snapshot/manifests/dumps.pp
M modules/snapshot/manifests/dumps/configs.pp
M modules/snapshot/manifests/dumps/dirs.pp
M modules/snapshot/templates/addschanges.conf.erb
M modules/snapshot/templates/set_dump_dirs.sh.erb
6 files changed, 26 insertions(+), 22 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/profile/manifests/dumps/generation/worker/common.pp
b/modules/profile/manifests/dumps/generation/worker/common.pp
index 0323b66..f26eb30 100644
--- a/modules/profile/manifests/dumps/generation/worker/common.pp
+++ b/modules/profile/manifests/dumps/generation/worker/common.pp
@@ -16,12 +16,15 @@
# dataset server config files,
# stages files, dblists, html templates
class { '::snapshot::dumps::dirs':
- user => 'dumpsgen',
- xmldumpsmount => $xmldumpsmount,
+ user => 'dumpsgen',
+ xmldumpsmount => $xmldumpsmount,
+ xmldumpspublicdir => "${xmldumpsmount}/xmldatadumps/public",
+ xmldumpsprivatedir => "${xmldumpsmount}/xmldatadumps/private",
+ dumpstempdir => "${xmldumpsmount}/xmldatadumps/temp",
+ cronsdir => "${xmldumpsmount}/otherdumps",
+ apachedir => '/srv/mediawiki',
}
- class { '::snapshot::dumps':
- xmldumpsmount => $xmldumpsmount,
- }
+ class { '::snapshot::dumps': }
# scap3 deployment of dump scripts
scap::target { 'dumps/dumps':
diff --git a/modules/snapshot/manifests/dumps.pp
b/modules/snapshot/manifests/dumps.pp
index 5c678e6..c96b929 100644
--- a/modules/snapshot/manifests/dumps.pp
+++ b/modules/snapshot/manifests/dumps.pp
@@ -1,10 +1,6 @@
-class snapshot::dumps(
- $xmldumpsmount = undef,
-) {
+class snapshot::dumps {
include ::snapshot::dumps::packages
- class { '::snapshot::dumps::configs':
- xmldumpsmount => $xmldumpsmount,
- }
+ include ::snapshot::dumps::configs
include ::snapshot::dumps::dblists
include ::snapshot::dumps::templates
include ::snapshot::dumps::stagesconfig
diff --git a/modules/snapshot/manifests/dumps/configs.pp
b/modules/snapshot/manifests/dumps/configs.pp
index e77eeaa..f1a2de1 100644
--- a/modules/snapshot/manifests/dumps/configs.pp
+++ b/modules/snapshot/manifests/dumps/configs.pp
@@ -1,9 +1,10 @@
-class snapshot::dumps::configs(
- $xmldumpsmount = undef,
-) {
+class snapshot::dumps::configs {
$dblistsdir = $snapshot::dumps::dirs::dblistsdir
$apachedir = $snapshot::dumps::dirs::apachedir
$confsdir = $snapshot::dumps::dirs::confsdir
+ $publicdir = $snapshot::dumps::dirs::xmldumpspublicdir
+ $privatedir = $snapshot::dumps::dirs::xmldumpsprivatedir
+ $tempdir = $snapshot::dumps::dirs::dumpstempdir
$enchunkhistory1 =
'30303,58141,112065,152180,212624,327599,375779,522388,545343,710090,880349,1113575,1157158,1547206'
$enchunkhistory2 =
'1773248,2021218,2153807,2427469,2634193,2467421,2705827,2895677,3679790,3449365,4114387,4596259,6533612'
@@ -137,9 +138,9 @@
snapshot::dumps::wikiconf { 'wikidump.conf.dumps':
configtype => 'allwikis',
config => $config,
- publicdir => "${xmldumpsmount}/xmldatadumps/public",
- privatedir => "${xmldumpsmount}/xmldatadumps/private",
- tempdir => "${xmldumpsmount}/xmldatadumps/temp",
+ publicdir => $publicdir,
+ privatedir => $privatedir,
+ tempdir => $tempdir,
}
file { "${confsdir}/table_jobs.yaml":
diff --git a/modules/snapshot/manifests/dumps/dirs.pp
b/modules/snapshot/manifests/dumps/dirs.pp
index 7001b64..91c73e2 100644
--- a/modules/snapshot/manifests/dumps/dirs.pp
+++ b/modules/snapshot/manifests/dumps/dirs.pp
@@ -1,6 +1,11 @@
class snapshot::dumps::dirs(
$user = undef,
$xmldumpsmount = undef,
+ $xmldumpspublicdir = undef,
+ $xmldumpsprivatedir = undef,
+ $dumpstempdir = undef,
+ $cronsdir = undef,
+ $apachedir = undef,
) {
# need to create and manage these, and have them
# available for a shell script that sets vars with
@@ -37,9 +42,6 @@
# need these only for the shell script that sets
# vars with their values for other scripts
- $xmldumpsdir = "${xmldumpsmount}/xmldatadumps"
- $cronsdir = "${xmldumpsmount}/otherdumps"
- $apachedir = '/srv/mediawiki'
$repodir = '/srv/deployment/dumps/dumps/xmldumps-backup'
# here's that script; it gets sourced by
diff --git a/modules/snapshot/templates/addschanges.conf.erb
b/modules/snapshot/templates/addschanges.conf.erb
index 14f2a87..03a927b 100644
--- a/modules/snapshot/templates/addschanges.conf.erb
+++ b/modules/snapshot/templates/addschanges.conf.erb
@@ -17,7 +17,7 @@
dumpdir=<%= scope.lookupvar('snapshot::dumps::dirs::cronsdir') -%>/incr
templatedir=<%= scope.lookupvar('snapshot::dumps::dirs::templsdir') %>
indextmpl=<%= scope.lookupvar('snapshot::dumps::dirs::templsdir')
-%>/incrs-index.html
-temp=<%= scope.lookupvar('snapshot::dumps::dirs::xmldumpsdir') -%>/temp
+temp=<%= scope.lookupvar('snapshot::dumps::dirs::dumpstempdir') %>
webroot=http://download.wikimedia.org
fileperms=0644
# revisions must be at least this much older than time of current run
diff --git a/modules/snapshot/templates/set_dump_dirs.sh.erb
b/modules/snapshot/templates/set_dump_dirs.sh.erb
index 1f999bd..18509ed 100644
--- a/modules/snapshot/templates/set_dump_dirs.sh.erb
+++ b/modules/snapshot/templates/set_dump_dirs.sh.erb
@@ -3,7 +3,9 @@
# set some directory paths many cron jobs need
confsdir="<%= scope.lookupvar('snapshot::dumps::dirs::confsdir') -%>"
repodir="<%= scope.lookupvar('snapshot::dumps::dirs::repodir') -%>"
-xmldumpsdir="<%= scope.lookupvar('snapshot::dumps::dirs::xmldumpsdir') -%>"
+xmldumpspublicdir="<%=
scope.lookupvar('snapshot::dumps::dirs::xmldumpspublicdir') -%>"
+dumpstempcdir="<%= scope.lookupvar('snapshot::dumps::dirs::dumpstempdir') -%>"
cronsdir="<%= scope.lookupvar('snapshot::dumps::dirs::cronsdir') -%>"
dumpsdir="<%= scope.lookupvar('snapshot::dumps::dirs::dumpsdir') -%>"
dblistsdir="<%= scope.lookupvar('snapshot::dumps::dirs::dblistsdir') -%>"
+apachedir="<%= scope.lookupvar('snapshot::dumps::dirs::apachedir') -%>"
--
To view, visit https://gerrit.wikimedia.org/r/397773
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9f65167f39e4391c10d2ace16cf8ff65a7c52f91
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <[email protected]>
Gerrit-Reviewer: ArielGlenn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
