ArielGlenn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/400405 )
Change subject: get rid of redundant code in dumps nfs server manifests
......................................................................
get rid of redundant code in dumps nfs server manifests
Change-Id: I902227b96e6f2e315fefaf23eba8b9c7861fdace
---
R modules/profile/manifests/dumps/generation/server/common.pp
M modules/profile/manifests/dumps/generation/server/primary.pp
M modules/role/manifests/dumps/generation/server/fallback.pp
3 files changed, 6 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/05/400405/1
diff --git a/modules/profile/manifests/dumps/generation/server/fallback.pp
b/modules/profile/manifests/dumps/generation/server/common.pp
similarity index 91%
rename from modules/profile/manifests/dumps/generation/server/fallback.pp
rename to modules/profile/manifests/dumps/generation/server/common.pp
index d247e91..e0fee61 100644
--- a/modules/profile/manifests/dumps/generation/server/fallback.pp
+++ b/modules/profile/manifests/dumps/generation/server/common.pp
@@ -1,4 +1,4 @@
-class profile::dumps::generation::server::fallback(
+class profile::dumps::generation::server::common(
$datadir = hiera('profile::dumps::basedatadir'),
$xmldumpsdir = hiera('profile::dumps::xmldumpspublicdir'),
$miscdatasetsdir = hiera('profile::dumps::miscdumpsdir'),
diff --git a/modules/profile/manifests/dumps/generation/server/primary.pp
b/modules/profile/manifests/dumps/generation/server/primary.pp
index 7c5b98c..bb88970 100644
--- a/modules/profile/manifests/dumps/generation/server/primary.pp
+++ b/modules/profile/manifests/dumps/generation/server/primary.pp
@@ -1,24 +1,10 @@
-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'),
-) {
- class { '::dumpsuser': }
-
- class { '::dumps::generation::server::dirs':
- datadir => $datadir,
- xmldumpsdir => $xmldumpsdir,
- tempdir => $dumpstempdir,
- miscdatasetsdir => $miscdatasetsdir,
- user => $dumpsuser::user,
- group => $dumpsuser::group,
- }
+class profile::dumps::generation::server::primary {
+ require profile::dumps::generation::server::common
class { '::dumps::generation::server::rsyncer':
- xmldumpsdir => $xmldumpsdir,
+ xmldumpsdir =>
$profile::dumps::generation::server::common::xmldumpsdir,
xmlremotedirs =>
'dumpsdata1002.eqiad.wmnet::data/xmldatadumps/public/,dataset1001.wikimedia.org::data/xmldatadumps/public/',
- miscdumpsdir => $miscdatasetsdir,
+ miscdumpsdir =>
$profile::dumps::generation::server::common::miscdatasetsdir,
miscremotedirs =>
'dumpsdata1002.eqiad.wmnet::data/otherdumps/,dataset1001.wikimedia.org::data/xmldatadumps/public/other/',
}
}
diff --git a/modules/role/manifests/dumps/generation/server/fallback.pp
b/modules/role/manifests/dumps/generation/server/fallback.pp
index 36440bb..4ae4988 100644
--- a/modules/role/manifests/dumps/generation/server/fallback.pp
+++ b/modules/role/manifests/dumps/generation/server/fallback.pp
@@ -3,7 +3,7 @@
include ::standard
include ::profile::base::firewall
- include ::profile::dumps::generation::server::fallback
+ include ::profile::dumps::generation::server::common
include ::profile::dumps::generation::server::rsync
include ::profile::dumps::rsyncer_peer
include ::profile::dumps::nfs
--
To view, visit https://gerrit.wikimedia.org/r/400405
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I902227b96e6f2e315fefaf23eba8b9c7861fdace
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
