ArielGlenn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/400403 )
Change subject: get rid of redundant code in dumps web server manifests
......................................................................
get rid of redundant code in dumps web server manifests
Change-Id: I7bfc4e5e7d762965abf3aed7cea58e0ebb846f98
---
D modules/dumps/manifests/web/xmldumps_active.pp
M modules/profile/manifests/dumps/web/xmldumps_active.pp
R modules/profile/manifests/dumps/web/xmldumps_common.pp
M modules/role/manifests/dumps/web/xmldumps_active.pp
M modules/role/manifests/dumps/web/xmldumps_fallback.pp
5 files changed, 19 insertions(+), 62 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/03/400403/1
diff --git a/modules/dumps/manifests/web/xmldumps_active.pp
b/modules/dumps/manifests/web/xmldumps_active.pp
deleted file mode 100644
index 7476d2e..0000000
--- a/modules/dumps/manifests/web/xmldumps_active.pp
+++ /dev/null
@@ -1,28 +0,0 @@
-class dumps::web::xmldumps_active(
- $do_acme = true,
- $datadir = undef,
- $xmldumpsdir = undef,
- $miscdatasetsdir = undef,
- $logs_dest = undef,
- $htmldumps_server = undef,
- $xmldumps_server = undef,
- $webuser = undef,
- $webgroup = undef,
-) {
- # active web server
- class {'::dumps::web::xmldumps':
- do_acme => $do_acme,
- datadir => $datadir,
- xmldumpsdir => $xmldumpsdir,
- miscdatasetsdir => $miscdatasetsdir,
- htmldumps_server => $htmldumps_server,
- xmldumps_server => $xmldumps_server,
- webuser => $webuser,
- webgroup => $webgroup,
- }
-
- # only the active web server should be syncing nginx logs
- class {'::dumps::web::rsync::nginxlogs':
- dest => $logs_dest,
- }
-}
diff --git a/modules/profile/manifests/dumps/web/xmldumps_active.pp
b/modules/profile/manifests/dumps/web/xmldumps_active.pp
index fd9783b..a600316 100644
--- a/modules/profile/manifests/dumps/web/xmldumps_active.pp
+++ b/modules/profile/manifests/dumps/web/xmldumps_active.pp
@@ -1,32 +1,18 @@
-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'),
-) {
- interface::add_ip6_mapped { 'main': }
+class profile::dumps::web::xmldumps_active {
+ require profile::dumps::web::xmldumps_common
- require profile::dumps::web::nginx
- class { '::dumpsuser': }
-
- class {'::dumps::web::xmldumps_active':
- do_acme => $do_acme,
- datadir => $datadir,
- xmldumpsdir => $xmldumpsdir,
- miscdatasetsdir => $miscdatasetsdir,
- logs_dest =>
'stat1005.eqiad.wmnet::srv/log/webrequest/archive/dumps.wikimedia.org/',
- htmldumps_server => 'francium.eqiad.wmnet',
- xmldumps_server => 'dumps.wikimedia.org',
- webuser => 'dumpsgen',
- webgroup => 'dumpsgen',
+ # copy dumps web server logs to stat host
+ class {'::dumps::web::rsync::nginxlogs':
+ dest =>
'stat1005.eqiad.wmnet::srv/log/webrequest/archive/dumps.wikimedia.org/',
}
+
# copy dumps and other datasets to fallback host(s) and to labs
class {'::dumps::copying::peers':
desthost => 'ms1001.wikimedia.org',
}
class {'::dumps::copying::labs':
labhost => 'labstore1003.eqiad.wmnet',
- xmldumpsdir => $xmldumpsdir,
- miscdatasetsdir => $miscdatasetsdir,
+ xmldumpsdir => $profile::dumps::web::xmldumps_common::xmldumpsdir,
+ miscdatasetsdir =>
$profile::dumps::web::xmldumps_common::miscdatasetsdir,
}
}
diff --git a/modules/profile/manifests/dumps/web/xmldumps_fallback.pp
b/modules/profile/manifests/dumps/web/xmldumps_common.pp
similarity index 68%
rename from modules/profile/manifests/dumps/web/xmldumps_fallback.pp
rename to modules/profile/manifests/dumps/web/xmldumps_common.pp
index 0978a57..5fa5f7d 100644
--- a/modules/profile/manifests/dumps/web/xmldumps_fallback.pp
+++ b/modules/profile/manifests/dumps/web/xmldumps_common.pp
@@ -1,4 +1,4 @@
-class profile::dumps::web::xmldumps_fallback(
+class profile::dumps::web::xmldumps_common(
$do_acme = hiera('do_acme'),
$datadir = hiera('profile::dumps::basedatadir'),
$xmldumpsdir = hiera('profile::dumps::xmldumpspublicdir'),
@@ -7,6 +7,14 @@
interface::add_ip6_mapped { 'main': }
require profile::dumps::web::nginx
+
+ # better here once than copy-pasted into multiple roles.
+ require profile::dumps::nfs
+ require profile::dumps::web::rsync_server
+ require profile::dumps::web::dumpstatusfiles_sync
+ require profile::dumps::web::cleanup
+ require profile::dumps::web::cleanup_miscdatasets
+
class { '::dumpsuser': }
class {'::dumps::web::xmldumps':
diff --git a/modules/role/manifests/dumps/web/xmldumps_active.pp
b/modules/role/manifests/dumps/web/xmldumps_active.pp
index 1fd10cd..3338065 100644
--- a/modules/role/manifests/dumps/web/xmldumps_active.pp
+++ b/modules/role/manifests/dumps/web/xmldumps_active.pp
@@ -4,14 +4,10 @@
class role::dumps::web::xmldumps_active {
include ::standard
include ::profile::base::firewall
+ include ::profile::dumps::web::xml_common
include ::profile::dumps::web::xmldumps_active
- include ::profile::dumps::web::rsync_server
- include ::profile::dumps::web::dumpstatusfiles_sync
include ::profile::dumps::rsyncer
include ::profile::dumps::fetcher
- include ::profile::dumps::nfs
- include ::profile::dumps::web::cleanup
- include ::profile::dumps::web::cleanup_miscdatasets
system::role { 'role::dumps::web::xmldumps': description => 'active web,
nfs and rsync server of xml/sql dumps' }
}
diff --git a/modules/role/manifests/dumps/web/xmldumps_fallback.pp
b/modules/role/manifests/dumps/web/xmldumps_fallback.pp
index a8e1eb5..3efeb9e 100644
--- a/modules/role/manifests/dumps/web/xmldumps_fallback.pp
+++ b/modules/role/manifests/dumps/web/xmldumps_fallback.pp
@@ -4,13 +4,8 @@
class role::dumps::web::xmldumps_fallback {
include ::standard
include ::profile::base::firewall
- include ::profile::dumps::web::xmldumps_fallback
- include ::profile::dumps::web::rsync_server
- include ::profile::dumps::web::dumpstatusfiles_sync
+ include ::profile::dumps::web::xml_common
include ::profile::dumps::rsyncer_peer
- include ::profile::dumps::nfs
- include ::profile::dumps::web::cleanup
- include ::profile::dumps::web::cleanup_miscdatasets
system::role { 'role::dumps::web::xmldumps': description => 'fallback web,
nfs and rsync server of xml/sql dumps' }
}
--
To view, visit https://gerrit.wikimedia.org/r/400403
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7bfc4e5e7d762965abf3aed7cea58e0ebb846f98
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
