[MediaWiki-commits] [Gerrit] operations/puppet[production]: use hieras settings for a few more hardcoded paths in dumps ...

[ArielGlenn (Code Review)]

ArielGlenn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/399356 )

Change subject: use hieras settings for a few more hardcoded paths in dumps 
profiles
..

use hieras settings for a few more hardcoded paths in dumps profiles

Change-Id: I7d9830c8040695e47723e5a69ede136de8b2458d
---
M modules/profile/manifests/dumps/generation/server/fallback.pp
M modules/profile/manifests/dumps/generation/server/primary.pp
M modules/profile/manifests/dumps/web/xmldumps_active.pp
M modules/profile/manifests/dumps/web/xmldumps_fallback.pp
4 files changed, 25 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/56/399356/1

diff --git a/modules/profile/manifests/dumps/generation/server/fallback.pp 
b/modules/profile/manifests/dumps/generation/server/fallback.pp
index 7f9b9cf..53a98f7 100644
--- a/modules/profile/manifests/dumps/generation/server/fallback.pp
+++ b/modules/profile/manifests/dumps/generation/server/fallback.pp
@@ -1,11 +1,15 @@
-class profile::dumps::generation::server::fallback {
+class profile::dumps::generation::server::fallback(
+$xmldumpsdir = hiera('profile::dumps::xmldumpspublicdir'),
+$miscdatasetsdir = hiera('profile::dumps::miscdumpsdir'),
+$dumpstempdir = hiera('profile::dumps::dumpstempdir'),
+) {
 class { '::dumpsuser': }
 
 class { '::dumps::generation::server::dirs':
 datadir => '/data/xmldatadumps',
-xmldumpsdir => '/data/xmldatadumps/public',
-tempdir => '/data/xmldatadumps/temp',
-miscdatasetsdir => '/data/otherdumps',
+xmldumpsdir => $xmldumpsdir,
+tempdir => $dumpstempdir,
+miscdatasetsdir => $miscdatasetsdir,
 user=> $dumpsuser::user,
 group   => $dumpsuser::group,
 }
diff --git a/modules/profile/manifests/dumps/generation/server/primary.pp 
b/modules/profile/manifests/dumps/generation/server/primary.pp
index a6ad506..6ad0dc6 100644
--- a/modules/profile/manifests/dumps/generation/server/primary.pp
+++ b/modules/profile/manifests/dumps/generation/server/primary.pp
@@ -1,19 +1,23 @@
-class profile::dumps::generation::server::primary {
+class profile::dumps::generation::server::primary(
+$xmldumpsdir = hiera('profile::dumps::xmldumpspublicdir'),
+$miscdatasetsdir = hiera('profile::dumps::miscdumpsdir'),
+$dumpstempdir = hiera('profile::dumps::dumpstempdir'),
+) {
 class { '::dumpsuser': }
 
 class { '::dumps::generation::server::dirs':
 datadir => '/data/xmldatadumps',
-xmldumpsdir => '/data/xmldatadumps/public',
-tempdir => '/data/xmldatadumps/temp',
-miscdatasetsdir => '/data/otherdumps',
+xmldumpsdir => $xmldumpsdir,
+tempdir => $dumpstempdir,
+miscdatasetsdir => $miscdatasetsdir,
 user=> $dumpsuser::user,
 group   => $dumpsuser::group,
 }
 
 class { '::dumps::generation::server::rsyncer':
-xmldumpsdir=> '/data/xmldatadumps/public',
+xmldumpsdir=> $xmldumpsdir,
 xmlremotedirs  => 
'dumpsdata1002.eqiad.wmnet::data/xmldatadumps/public/,dataset1001.wikimedia.org::data/xmldatadumps/public/',
-miscdumpsdir   => '/data/otherdumps',
+miscdumpsdir   => $miscdatasetsdir,
 miscremotedirs => 
'dumpsdata1002.eqiad.wmnet::data/otherdumps/,dataset1001.wikimedia.org::data/xmldatadumps/public/other/',
 }
 }
diff --git a/modules/profile/manifests/dumps/web/xmldumps_active.pp 
b/modules/profile/manifests/dumps/web/xmldumps_active.pp
index 6eff666..252fc6b 100644
--- a/modules/profile/manifests/dumps/web/xmldumps_active.pp
+++ b/modules/profile/manifests/dumps/web/xmldumps_active.pp
@@ -1,15 +1,15 @@
 class profile::dumps::web::xmldumps_active(
 $do_acme = hiera('do_acme'),
+$xmldumpsdir = hiera('profile::dumps::xmldumpspublicdir'),
+$miscdatasetsdir = hiera('profile::dumps::miscdumpsdir'),
 ) {
 class { '::dumpsuser': }
-$xmldumpsdir = '/data/xmldatadumps/public'
-$miscdatasetsdir = '/data/xmldatadumps/public/other'
 
 class {'::dumps::web::xmldumps_active':
 do_acme  => $do_acme,
 datadir  => '/data/xmldatadumps',
 xmldumpsdir  => $xmldumpsdir,
-miscdatasetsdir  => '/data/xmldatadumps/public/other',
+miscdatasetsdir  => $miscdatasetsdir,
 logs_dest=> 
'stat1005.eqiad.wmnet::srv/log/webrequest/archive/dumps.wikimedia.org/',
 htmldumps_server => 'francium.eqiad.wmnet',
 xmldumps_server  => 'dumps.wikimedia.org',
diff --git a/modules/profile/manifests/dumps/web/xmldumps_fallback.pp 
b/modules/profile/manifests/dumps/web/xmldumps_fallback.pp
index bb58fa9..08b9d14 100644
--- a/modules/profile/manifests/dumps/web/xmldumps_fallback.pp
+++ 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: use hieras settings for a few more hardcoded paths in dumps ...

[ArielGlenn (Code Review)]

ArielGlenn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/399356 )

Change subject: use hieras settings for a few more hardcoded paths in dumps 
profiles
..


use hieras settings for a few more hardcoded paths in dumps profiles

Change-Id: I7d9830c8040695e47723e5a69ede136de8b2458d
---
M modules/profile/manifests/dumps/generation/server/fallback.pp
M modules/profile/manifests/dumps/generation/server/primary.pp
M modules/profile/manifests/dumps/web/xmldumps_active.pp
M modules/profile/manifests/dumps/web/xmldumps_fallback.pp
4 files changed, 25 insertions(+), 15 deletions(-)

Approvals:
  ArielGlenn: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/profile/manifests/dumps/generation/server/fallback.pp 
b/modules/profile/manifests/dumps/generation/server/fallback.pp
index 7f9b9cf..53a98f7 100644
--- a/modules/profile/manifests/dumps/generation/server/fallback.pp
+++ b/modules/profile/manifests/dumps/generation/server/fallback.pp
@@ -1,11 +1,15 @@
-class profile::dumps::generation::server::fallback {
+class profile::dumps::generation::server::fallback(
+$xmldumpsdir = hiera('profile::dumps::xmldumpspublicdir'),
+$miscdatasetsdir = hiera('profile::dumps::miscdumpsdir'),
+$dumpstempdir = hiera('profile::dumps::dumpstempdir'),
+) {
 class { '::dumpsuser': }
 
 class { '::dumps::generation::server::dirs':
 datadir => '/data/xmldatadumps',
-xmldumpsdir => '/data/xmldatadumps/public',
-tempdir => '/data/xmldatadumps/temp',
-miscdatasetsdir => '/data/otherdumps',
+xmldumpsdir => $xmldumpsdir,
+tempdir => $dumpstempdir,
+miscdatasetsdir => $miscdatasetsdir,
 user=> $dumpsuser::user,
 group   => $dumpsuser::group,
 }
diff --git a/modules/profile/manifests/dumps/generation/server/primary.pp 
b/modules/profile/manifests/dumps/generation/server/primary.pp
index a6ad506..6ad0dc6 100644
--- a/modules/profile/manifests/dumps/generation/server/primary.pp
+++ b/modules/profile/manifests/dumps/generation/server/primary.pp
@@ -1,19 +1,23 @@
-class profile::dumps::generation::server::primary {
+class profile::dumps::generation::server::primary(
+$xmldumpsdir = hiera('profile::dumps::xmldumpspublicdir'),
+$miscdatasetsdir = hiera('profile::dumps::miscdumpsdir'),
+$dumpstempdir = hiera('profile::dumps::dumpstempdir'),
+) {
 class { '::dumpsuser': }
 
 class { '::dumps::generation::server::dirs':
 datadir => '/data/xmldatadumps',
-xmldumpsdir => '/data/xmldatadumps/public',
-tempdir => '/data/xmldatadumps/temp',
-miscdatasetsdir => '/data/otherdumps',
+xmldumpsdir => $xmldumpsdir,
+tempdir => $dumpstempdir,
+miscdatasetsdir => $miscdatasetsdir,
 user=> $dumpsuser::user,
 group   => $dumpsuser::group,
 }
 
 class { '::dumps::generation::server::rsyncer':
-xmldumpsdir=> '/data/xmldatadumps/public',
+xmldumpsdir=> $xmldumpsdir,
 xmlremotedirs  => 
'dumpsdata1002.eqiad.wmnet::data/xmldatadumps/public/,dataset1001.wikimedia.org::data/xmldatadumps/public/',
-miscdumpsdir   => '/data/otherdumps',
+miscdumpsdir   => $miscdatasetsdir,
 miscremotedirs => 
'dumpsdata1002.eqiad.wmnet::data/otherdumps/,dataset1001.wikimedia.org::data/xmldatadumps/public/other/',
 }
 }
diff --git a/modules/profile/manifests/dumps/web/xmldumps_active.pp 
b/modules/profile/manifests/dumps/web/xmldumps_active.pp
index 6eff666..252fc6b 100644
--- a/modules/profile/manifests/dumps/web/xmldumps_active.pp
+++ b/modules/profile/manifests/dumps/web/xmldumps_active.pp
@@ -1,15 +1,15 @@
 class profile::dumps::web::xmldumps_active(
 $do_acme = hiera('do_acme'),
+$xmldumpsdir = hiera('profile::dumps::xmldumpspublicdir'),
+$miscdatasetsdir = hiera('profile::dumps::miscdumpsdir'),
 ) {
 class { '::dumpsuser': }
-$xmldumpsdir = '/data/xmldatadumps/public'
-$miscdatasetsdir = '/data/xmldatadumps/public/other'
 
 class {'::dumps::web::xmldumps_active':
 do_acme  => $do_acme,
 datadir  => '/data/xmldatadumps',
 xmldumpsdir  => $xmldumpsdir,
-miscdatasetsdir  => '/data/xmldatadumps/public/other',
+miscdatasetsdir  => $miscdatasetsdir,
 logs_dest=> 
'stat1005.eqiad.wmnet::srv/log/webrequest/archive/dumps.wikimedia.org/',
 htmldumps_server => 'francium.eqiad.wmnet',
 xmldumps_server  => 'dumps.wikimedia.org',
diff --git a/modules/profile/manifests/dumps/web/xmldumps_fallback.pp 
b/modules/profile/manifests/dumps/web/xmldumps_fallback.pp
index bb58fa9..08b9d14 100644
--- a/modules/profile/manifests/dumps/web/xmldumps_fallback.pp
+++ b/modules/profile/manifests/dumps/web/xmldumps_fallback.pp