ArielGlenn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/399358 )
Change subject: move one more hardcoded path from dumps profiles to hiera
......................................................................
move one more hardcoded path from dumps profiles to hiera
Change-Id: I879097770ace26798127e742b602cd14834fcb3e
---
M hieradata/hosts/dataset1001.yaml
M hieradata/hosts/dumpsdata1001.yaml
M hieradata/hosts/dumpsdata1002.yaml
M hieradata/hosts/ms1001.yaml
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
8 files changed, 12 insertions(+), 4 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/hosts/dataset1001.yaml b/hieradata/hosts/dataset1001.yaml
index 7029586..7bd4d09 100644
--- a/hieradata/hosts/dataset1001.yaml
+++ b/hieradata/hosts/dataset1001.yaml
@@ -1,5 +1,6 @@
profile::dumps::cleanup::isreplica: true
profile::dumps::cleanup::labscopy: false
+profile::dumps::basedatadir: '/data/xmldatadumps'
profile::dumps::miscdumpsdir: '/data/xmldatadumps/public/other'
profile::dumps::xmldumpspublicdir: '/data/xmldatadumps/public'
profile::dumps::dumpstempdir: '/data/xmldatadumps/temp'
diff --git a/hieradata/hosts/dumpsdata1001.yaml
b/hieradata/hosts/dumpsdata1001.yaml
index 511cd68..f18774a 100644
--- a/hieradata/hosts/dumpsdata1001.yaml
+++ b/hieradata/hosts/dumpsdata1001.yaml
@@ -1,3 +1,4 @@
+profile::dumps::basedatadir: '/data/xmldatadumps'
profile::dumps::miscdumpsdir: '/data/otherdumps'
profile::dumps::xmldumpspublicdir: '/data/xmldatadumps/public'
profile::dumps::dumpstempdir: '/data/xmldatadumps/temp'
diff --git a/hieradata/hosts/dumpsdata1002.yaml
b/hieradata/hosts/dumpsdata1002.yaml
index 9855fee..717b3d0 100644
--- a/hieradata/hosts/dumpsdata1002.yaml
+++ b/hieradata/hosts/dumpsdata1002.yaml
@@ -1,3 +1,4 @@
+profile::dumps::basedatadir: '/data/xmldatadumps'
profile::dumps::miscdumpsdir: '/data/otherdumps'
profile::dumps::xmldumpspublicdir: '/data/xmldatadumps/public'
profile::dumps::dumpstempdir: '/data/xmldatadumps/temp'
diff --git a/hieradata/hosts/ms1001.yaml b/hieradata/hosts/ms1001.yaml
index 267b0b1..1781b14 100644
--- a/hieradata/hosts/ms1001.yaml
+++ b/hieradata/hosts/ms1001.yaml
@@ -1,6 +1,7 @@
profile::dumps::cleanup::isreplica: true
profile::dumps::cleanup::labscopy: false
+profile::dumps::basedatadir: '/data/xmldatadumps'
profile::dumps::miscdumpsdir: '/data/xmldatadumps/public/other'
profile::dumps::xmldumpspublicdir: '/data/xmldatadumps/public'
profile::dumps::dumpstempdir: '/data/xmldatadumps/temp'
diff --git a/modules/profile/manifests/dumps/generation/server/fallback.pp
b/modules/profile/manifests/dumps/generation/server/fallback.pp
index 53a98f7..d247e91 100644
--- a/modules/profile/manifests/dumps/generation/server/fallback.pp
+++ b/modules/profile/manifests/dumps/generation/server/fallback.pp
@@ -1,4 +1,5 @@
class profile::dumps::generation::server::fallback(
+ $datadir = hiera('profile::dumps::basedatadir'),
$xmldumpsdir = hiera('profile::dumps::xmldumpspublicdir'),
$miscdatasetsdir = hiera('profile::dumps::miscdumpsdir'),
$dumpstempdir = hiera('profile::dumps::dumpstempdir'),
@@ -6,7 +7,7 @@
class { '::dumpsuser': }
class { '::dumps::generation::server::dirs':
- datadir => '/data/xmldatadumps',
+ datadir => $datadir,
xmldumpsdir => $xmldumpsdir,
tempdir => $dumpstempdir,
miscdatasetsdir => $miscdatasetsdir,
diff --git a/modules/profile/manifests/dumps/generation/server/primary.pp
b/modules/profile/manifests/dumps/generation/server/primary.pp
index 6ad0dc6..7c5b98c 100644
--- a/modules/profile/manifests/dumps/generation/server/primary.pp
+++ b/modules/profile/manifests/dumps/generation/server/primary.pp
@@ -1,4 +1,5 @@
class profile::dumps::generation::server::primary(
+ $datadir = hiera('profile::dumps::basedatadir'),
$xmldumpsdir = hiera('profile::dumps::xmldumpspublicdir'),
$miscdatasetsdir = hiera('profile::dumps::miscdumpsdir'),
$dumpstempdir = hiera('profile::dumps::dumpstempdir'),
@@ -6,7 +7,7 @@
class { '::dumpsuser': }
class { '::dumps::generation::server::dirs':
- datadir => '/data/xmldatadumps',
+ datadir => $datadir,
xmldumpsdir => $xmldumpsdir,
tempdir => $dumpstempdir,
miscdatasetsdir => $miscdatasetsdir,
diff --git a/modules/profile/manifests/dumps/web/xmldumps_active.pp
b/modules/profile/manifests/dumps/web/xmldumps_active.pp
index 252fc6b..d7d1260 100644
--- a/modules/profile/manifests/dumps/web/xmldumps_active.pp
+++ b/modules/profile/manifests/dumps/web/xmldumps_active.pp
@@ -1,5 +1,6 @@
class profile::dumps::web::xmldumps_active(
$do_acme = hiera('do_acme'),
+ $datadir = hiera('profile::dumps::basedatadir'),
$xmldumpsdir = hiera('profile::dumps::xmldumpspublicdir'),
$miscdatasetsdir = hiera('profile::dumps::miscdumpsdir'),
) {
@@ -7,7 +8,7 @@
class {'::dumps::web::xmldumps_active':
do_acme => $do_acme,
- datadir => '/data/xmldatadumps',
+ datadir => $datadir,
xmldumpsdir => $xmldumpsdir,
miscdatasetsdir => $miscdatasetsdir,
logs_dest =>
'stat1005.eqiad.wmnet::srv/log/webrequest/archive/dumps.wikimedia.org/',
diff --git a/modules/profile/manifests/dumps/web/xmldumps_fallback.pp
b/modules/profile/manifests/dumps/web/xmldumps_fallback.pp
index 08b9d14..dbe5396 100644
--- a/modules/profile/manifests/dumps/web/xmldumps_fallback.pp
+++ b/modules/profile/manifests/dumps/web/xmldumps_fallback.pp
@@ -1,5 +1,6 @@
class profile::dumps::web::xmldumps_fallback(
$do_acme = hiera('do_acme'),
+ $datadir = hiera('profile::dumps::basedatadir'),
$xmldumpsdir = hiera('profile::dumps::xmldumpspublicdir'),
$miscdatasetsdir = hiera('profile::dumps::miscdumpsdir'),
) {
@@ -7,7 +8,7 @@
class {'::dumps::web::xmldumps':
do_acme => $do_acme,
- datadir => '/data/xmldatadumps',
+ datadir => $datadir,
xmldumpsdir => $xmldumpsdir,
miscdatasetsdir => $miscdatasetsdir,
htmldumps_server => 'francium.eqiad.wmnet',
--
To view, visit https://gerrit.wikimedia.org/r/399358
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I879097770ace26798127e742b602cd14834fcb3e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <ar...@wikimedia.org>
Gerrit-Reviewer: ArielGlenn <ar...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
