ArielGlenn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/381524 )
Change subject: move hardcoded references to stats hosts from dumps module to
profiles
......................................................................
move hardcoded references to stats hosts from dumps module to profiles
Bug: T175528
Change-Id: I21747a2ccf8d99ee675b949bd4525595dcc22892
---
M modules/dumps/manifests/rsync/media.pp
M modules/dumps/manifests/rsync/pagecounts_ez.pp
M modules/dumps/manifests/web/xmldumps_active.pp
R modules/dumps/templates/rsync/rsyncd.conf.media.erb
R modules/dumps/templates/rsync/rsyncd.conf.pagecounts_ez.erb
M modules/profile/manifests/dumps/rsyncer.pp
M modules/profile/manifests/dumps/web/xmldumps_active.pp
7 files changed, 28 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/24/381524/1
diff --git a/modules/dumps/manifests/rsync/media.pp
b/modules/dumps/manifests/rsync/media.pp
index 6d58314..c9b31ba 100644
--- a/modules/dumps/manifests/rsync/media.pp
+++ b/modules/dumps/manifests/rsync/media.pp
@@ -1,12 +1,14 @@
-class dumps::rsync::media {
+class dumps::rsync::media(
+ $hosts_allow = undef,
+) {
include ::dumps::rsync::common
file { '/etc/rsyncd.d/30-rsync-media.conf':
- ensure => 'present',
- mode => '0444',
- owner => 'root',
- group => 'root',
- source => 'puppet:///modules/dumps/rsync/rsyncd.conf.media',
- notify => Exec['update-rsyncd.conf'],
+ ensure => 'present',
+ mode => '0444',
+ owner => 'root',
+ group => 'root',
+ content => templates('dumps/rsync/rsyncd.conf.media'),
+ notify => Exec['update-rsyncd.conf'],
}
}
diff --git a/modules/dumps/manifests/rsync/pagecounts_ez.pp
b/modules/dumps/manifests/rsync/pagecounts_ez.pp
index 4997d85..2724a7f 100644
--- a/modules/dumps/manifests/rsync/pagecounts_ez.pp
+++ b/modules/dumps/manifests/rsync/pagecounts_ez.pp
@@ -1,12 +1,14 @@
-class dumps::rsync::pagecounts_ez {
+class dumps::rsync::pagecounts_ez(
+ $hosts_allow = undef,
+) {
include ::dumps::rsync::common
file { '/etc/rsyncd.d/30-rsync-pagecounts_ez.conf':
- ensure => 'present',
- mode => '0444',
- owner => 'root',
- group => 'root',
- source => 'puppet:///modules/dumps/rsync/rsyncd.conf.pagecounts_ez',
- notify => Exec['update-rsyncd.conf'],
+ ensure => 'present',
+ mode => '0444',
+ owner => 'root',
+ group => 'root',
+ content => templates('dumps/rsync/rsyncd.conf.pagecounts_ez.erb'),
+ notify => Exec['update-rsyncd.conf'],
}
}
diff --git a/modules/dumps/manifests/web/xmldumps_active.pp
b/modules/dumps/manifests/web/xmldumps_active.pp
index 3cc0856..57a6e21 100644
--- a/modules/dumps/manifests/web/xmldumps_active.pp
+++ b/modules/dumps/manifests/web/xmldumps_active.pp
@@ -3,6 +3,7 @@
$datadir = undef,
$publicdir = undef,
$otherdir = undef,
+ $logs_dest = undef,
) {
# active web server
class {'::dumps::web::xmldumps':
@@ -14,6 +15,6 @@
# only the active web server should be syncing nginx logs
class {'::dumps::web::rsync::nginxlogs':
- dest =>
'stat1005.eqiad.wmnet::srv/log/webrequest/archive/dumps.wikimedia.org/',
+ dest => $logs_dest,
}
}
diff --git a/modules/dumps/files/rsync/rsyncd.conf.media
b/modules/dumps/templates/rsync/rsyncd.conf.media.erb
similarity index 75%
rename from modules/dumps/files/rsync/rsyncd.conf.media
rename to modules/dumps/templates/rsync/rsyncd.conf.media.erb
index 9e27fce..a3f524f 100644
--- a/modules/dumps/files/rsync/rsyncd.conf.media
+++ b/modules/dumps/templates/rsync/rsyncd.conf.media.erb
@@ -3,12 +3,12 @@
### puppet:///modules/dumps/rsync/rsyncd.conf.media
#####################################################################
-# write access from stat100[4,5] to media directory.
+# write access from <%= @hosts_allow %> to media directory.
# Erik Z uses this.
[media]
uid = datasets
gid = wikidev
read only = false
path = /data/xmldatadumps/public/other/media
-hosts allow = stat1005.eqiad.wmnet stat1006.eqiad.wmnet
+hosts allow = <%= @hosts_allow %>
diff --git a/modules/dumps/files/rsync/rsyncd.conf.pagecounts_ez
b/modules/dumps/templates/rsync/rsyncd.conf.pagecounts_ez.erb
similarity index 76%
rename from modules/dumps/files/rsync/rsyncd.conf.pagecounts_ez
rename to modules/dumps/templates/rsync/rsyncd.conf.pagecounts_ez.erb
index 97055d4..f40c564 100644
--- a/modules/dumps/files/rsync/rsyncd.conf.pagecounts_ez
+++ b/modules/dumps/templates/rsync/rsyncd.conf.pagecounts_ez.erb
@@ -3,12 +3,12 @@
### puppet:///modules/dumps/rsync/rsyncd.conf.pagecounts_ez
#####################################################################
-# write access from stat100[4,5] to pagecounts-ez directory.
+# write access from <%= @hosts_allow %> to pagecounts-ez directory.
# Erik Z uses this. See T80444.
[pagecounts-ez]
uid = datasets
gid = wikidev
read only = false
path = /data/xmldatadumps/public/other/pagecounts-ez
-hosts allow = stat1005.eqiad.wmnet stat1006.eqiad.wmnet
+hosts allow = <%= @hosts_allow %>
diff --git a/modules/profile/manifests/dumps/rsyncer.pp
b/modules/profile/manifests/dumps/rsyncer.pp
index cb6641c..498370f 100644
--- a/modules/profile/manifests/dumps/rsyncer.pp
+++ b/modules/profile/manifests/dumps/rsyncer.pp
@@ -1,10 +1,11 @@
class profile::dumps::rsyncer(
$rsync_clients = hiera('dumps_web_rsync_server_clients'),
) {
+ $stats_hosts = 'stat1005.eqiad.wmnet stat1006.eqiad.wmnet'
class {'::dumps::rsync::default':}
- class {'::dumps::rsync::media':}
+ class {'::dumps::rsync::media': hosts_allow -> $stats_hosts}
class {'::dumps::rsync::memfix':}
- class {'::dumps::rsync::pagecounts_ez':}
+ class {'::dumps::rsync::pagecounts_ez': hosts_allow => $stats_hosts}
class {'::dumps::rsync::peers':}
class {'::dumps::rsync::phab_dump':}
$hosts_allow = join(concat($rsync_clients['ipv4']['external'],
$rsync_clients['ipv6']['external']), ' ')
diff --git a/modules/profile/manifests/dumps/web/xmldumps_active.pp
b/modules/profile/manifests/dumps/web/xmldumps_active.pp
index 73b480a..7cc0069 100644
--- a/modules/profile/manifests/dumps/web/xmldumps_active.pp
+++ b/modules/profile/manifests/dumps/web/xmldumps_active.pp
@@ -4,6 +4,7 @@
datadir => '/data/xmldatadumps',
publicdir => '/data/xmldatadumps/public',
otherdir => '/data/xmldatadumps/public/other',
+ logs_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':}
--
To view, visit https://gerrit.wikimedia.org/r/381524
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I21747a2ccf8d99ee675b949bd4525595dcc22892
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
