ArielGlenn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/398095 )
Change subject: clean up directory setup manifests for dumps nfs and web servers
......................................................................
clean up directory setup manifests for dumps nfs and web servers
There are some dirs common to both; move them out into a separate
manifest. Label everything else so it's clear which directories
are declared where and why.
Change-Id: I8542b5d48afa5914173a26dda37a7fcbd2c9d86a
---
M modules/dumps/manifests/generation/server/dirs.pp
A modules/dumps/manifests/server_dirs.pp
M modules/dumps/manifests/web/dirs.pp
3 files changed, 35 insertions(+), 41 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/dumps/manifests/generation/server/dirs.pp
b/modules/dumps/manifests/generation/server/dirs.pp
index 1c29f28..0765360 100644
--- a/modules/dumps/manifests/generation/server/dirs.pp
+++ b/modules/dumps/manifests/generation/server/dirs.pp
@@ -6,6 +6,14 @@
$user = undef,
$group = undef,
) {
+ class {'dumps::server_dirs':
+ datadir => $datadir,
+ xmldumpsdir => $xmldumpsdir,
+ miscdatasetsdir => $miscdatasetsdir,
+ user => $user,
+ group => $group,
+ }
+
# Directories where dumps of any type are generated
# This list is not for one-off directories, nor for
# directories with incoming rsyncs of datasets
@@ -16,26 +24,23 @@
$medialistsdir = "${miscdatasetsdir}/imageinfo"
$incrsdir = "${miscdatasetsdir}/incr"
$mediatitlesdir = "${miscdatasetsdir}/mediatitles"
- $othermiscdir = "${miscdatasetsdir}/misc"
$pagetitlesdir = "${miscdatasetsdir}/pagetitles"
- $othertestfilesdir = "${miscdatasetsdir}/testfiles"
$otherwikibasedir = "${miscdatasetsdir}/wikibase"
$otherwikibasewikidatadir = "${miscdatasetsdir}/wikibase/wikidatawiki"
$otherwikidatadir = "${miscdatasetsdir}/wikidata"
- # top level directories for various dumps/datasets
- file { [ $datadir, $xmldumpsdir, $miscdatasetsdir, $tempdir ]:
+ # top level directories for various dumps/datasets, on generation hosts
only
+ file { $tempdir:
ensure => 'directory',
mode => '0755',
owner => $user,
group => $group,
}
- # subdirs for various dumps
+ # subdirs for various generated dumps
file { [ $cirrussearchdir, $xlationdir, $categoriesrdfdir,
$globalblocksdir, $medialistsdir, $incrsdir,
- $mediatitlesdir, $othermiscdir, $pagetitlesdir,
- $othertestfilesdir ]:
+ $mediatitlesdir, $pagetitlesdir]:
ensure => 'directory',
mode => '0755',
diff --git a/modules/dumps/manifests/server_dirs.pp
b/modules/dumps/manifests/server_dirs.pp
new file mode 100644
index 0000000..7b0b3d64
--- /dev/null
+++ b/modules/dumps/manifests/server_dirs.pp
@@ -0,0 +1,15 @@
+class dumps::server_dirs(
+ $datadir = undef,
+ $xmldumpsdir = undef,
+ $miscdatasetsdir = undef,
+ $user = undef,
+ $group = undef,
+) {
+ # top level directories for various dumps/datasets
+ file { [$datadir, $xmldumpsdir, $miscdatasetsdir]:
+ ensure => 'directory',
+ mode => '0755',
+ owner => $user,
+ group => $group,
+ }
+}
diff --git a/modules/dumps/manifests/web/dirs.pp
b/modules/dumps/manifests/web/dirs.pp
index beb4cac..f691999 100644
--- a/modules/dumps/manifests/web/dirs.pp
+++ b/modules/dumps/manifests/web/dirs.pp
@@ -5,46 +5,20 @@
$user = undef,
$group = undef,
) {
- # Please note that this is incomplete, but new directories
- # should be defined in puppet (here).
+ class {'dumps::server_dirs':
+ datadir => $datadir,
+ xmldumpsdir => $xmldumpsdir,
+ miscdatasetsdir => $miscdatasetsdir,
+ user => $user,
+ group => $group,
+ }
+
$analyticsdir = "${miscdatasetsdir}/analytics"
$othermiscdir = "${miscdatasetsdir}/misc"
$othertestfilesdir = "${miscdatasetsdir}/testfiles"
$miscdatasetsdir_wikidata_legacy = "${miscdatasetsdir}/wikidata"
$miscdatasetsdir_wikibase = "${miscdatasetsdir}/wikibase/"
$relative_wikidatawiki = 'other/wikibase/wikidatawiki'
- $xlationdir = "${miscdatasetsdir}/contenttranslation"
- $cirrussearchdir = "${miscdatasetsdir}/cirrussearch"
- $medialistsdir = "${miscdatasetsdir}/imageinfo"
- $pagetitlesdir = "${miscdatasetsdir}/pagetitles"
- $mediatitlesdir = "${miscdatasetsdir}/mediatitles"
- $categoriesrdf = "${miscdatasetsdir}/categoriesrdf"
-
- # top level dir
- file { $datadir:
- ensure => 'directory',
- mode => '0755',
- owner => 'root',
- group => 'root',
- }
-
- # top-level dirs for various dump trees
- file { [ $xmldumpsdir, $miscdatasetsdir ]:
- ensure => 'directory',
- mode => '0755',
- owner => $user,
- group => $group,
- }
-
- # subdirs for various misc dumps
- file { [ $xlationdir, $cirrussearchdir, $medialistsdir,
- $pagetitlesdir, $categoriesrdf ]:
-
- ensure => 'directory',
- mode => '0755',
- owner => $user,
- group => $group,
- }
# subdirs for misc datasets that aren't dumps
file { [ $analyticsdir, $othermiscdir, $othertestfilesdir ]:
--
To view, visit https://gerrit.wikimedia.org/r/398095
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8542b5d48afa5914173a26dda37a7fcbd2c9d86a
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
