Madhuvishy has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/401198 )
Change subject: public_dumps: Remove module path and rename to distribution
......................................................................
public_dumps: Remove module path and rename to distribution
Removing the module path for public_dumps since it should
really be in the profile path.
Also changing public to distribution, since public is a vague
name, and we could end up with dumps generation and dumps
distribution as 2 distinct roles.
Bug: T171539
Change-Id: If03cf64f3f577f76914d0e0ab2d72a932340ba8f
---
M manifests/site.pp
R modules/profile/manifests/dumps/distribution/server.pp
A modules/role/manifests/dumps/distribution/server.pp
D modules/role/manifests/dumps/public/server.pp
4 files changed, 21 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/98/401198/1
diff --git a/manifests/site.pp b/manifests/site.pp
index df1b8a0..d90fb8a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1248,7 +1248,7 @@
}
node /labstore100[67]\.wikimedia\.org/ {
- role(dumps::public::server)
+ role(dumps::distribution::server)
}
node /labstore200[1-2]\.codfw\.wmnet/ {
diff --git a/modules/public_dumps/manifests/server.pp
b/modules/profile/manifests/dumps/distribution/server.pp
similarity index 66%
rename from modules/public_dumps/manifests/server.pp
rename to modules/profile/manifests/dumps/distribution/server.pp
index 94e1429..a7d1edc 100644
--- a/modules/public_dumps/manifests/server.pp
+++ b/modules/profile/manifests/dumps/distribution/server.pp
@@ -1,5 +1,9 @@
-# Base class to set up a Public Dumps server
-class public_dumps::server {
+# Profile for Dumps distribution server in the Public VLAN,
+# that serves dumps to Cloud VPS/Stat boxes via NFS,
+# or via web or rsync to mirrors
+
+class profile::dumps::distribution::server {
+ class { '::dumpsuser': }
file { '/srv/dumps':
ensure => 'directory',
diff --git a/modules/role/manifests/dumps/distribution/server.pp
b/modules/role/manifests/dumps/distribution/server.pp
new file mode 100644
index 0000000..250130c
--- /dev/null
+++ b/modules/role/manifests/dumps/distribution/server.pp
@@ -0,0 +1,14 @@
+class role::dumps::distribution::server {
+ system::role { 'dumps::distribution::server': description => 'labstore
host in the public VLAN that distributes Dumps to clients via NFS/Web/Rsync' }
+
+ include ::standard
+ include ::profile::base::firewall
+ include ::profile::wmcs::nfs::ferm
+ include ::profile::dumps::distribution::server
+ include ::profile::dumps::web::rsync_server
+ include ::profile::dumps::rsyncer
+ include ::profile::dumps::web::dumpstatusfiles_sync
+ include ::profile::dumps::web::cleanup
+ include ::profile::dumps::web::cleanup_miscdatasets
+
+}
diff --git a/modules/role/manifests/dumps/public/server.pp
b/modules/role/manifests/dumps/public/server.pp
deleted file mode 100644
index d20ae51..0000000
--- a/modules/role/manifests/dumps/public/server.pp
+++ /dev/null
@@ -1,14 +0,0 @@
-class role::dumps::public::server {
- system::role { 'dumps::public::server': description => 'labstore host in
the public VLAN that serves Dumps to clients via NFS/Web/Rsync' }
-
- include ::standard
- include ::profile::base::firewall
- include ::profile::wmcs::nfs::ferm
- include ::profile::dumps::public_server
- include ::profile::dumps::web::rsync_server
- include ::profile::dumps::rsyncer
- include ::profile::dumps::web::dumpstatusfiles_sync
- include ::profile::dumps::web::cleanup
- include ::profile::dumps::web::cleanup_miscdatasets
-
-}
--
To view, visit https://gerrit.wikimedia.org/r/401198
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If03cf64f3f577f76914d0e0ab2d72a932340ba8f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy <mviswanat...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
