Faidon Liambotis has submitted this change and it was merged.
Change subject: Remove role::mirror classes
......................................................................
Remove role::mirror classes
role:mirror::media can be removed:
< apergos> at this point role/mirror.pp can go, actually
< apergos> we don't serve media via rsync to anyone
< apergos> so just pull it from any host that claims to have it
role::mirror::common was included from a bunch of the dataset module's
classes. It was simple enough and has now been renamed to
dataset::common, under the dataset module.
Change-Id: I9a45120bfdfae949f72e6f60cec132de137417e9
---
D manifests/role/mirror.pp
M manifests/site.pp
A modules/dataset/manifests/common.pp
M modules/dataset/manifests/cron/kiwix.pp
M modules/dataset/manifests/cron/rsync/labs.pp
M modules/dataset/manifests/cron/rsync/peers.pp
M modules/dataset/manifests/init.pp
M modules/dataset/manifests/rsync/pagecounts.pp
M modules/dataset/manifests/rsync/peers.pp
M modules/dataset/manifests/rsync/public.pp
10 files changed, 14 insertions(+), 42 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/mirror.pp b/manifests/role/mirror.pp
deleted file mode 100644
index 6a5216d..0000000
--- a/manifests/role/mirror.pp
+++ /dev/null
@@ -1,34 +0,0 @@
-# role/mirror.pp
-# mirror::media and mirror::dumps role classes
-
-class role::mirror::common {
-
- package { 'rsync':
- ensure => latest,
- }
-
- include vm::higher_min_free_kbytes
-}
-
-class role::mirror::media {
- include role::mirror::common
-
- system::role { 'role::mirror::media':
- description => 'Media mirror (rsync access for external mirrors)',
- }
-
- file { '/root/backups/rsync-media-cron.sh':
- ensure => present,
- mode => '0755',
- source => 'puppet:///files/misc/mirror/rsync-media-cron.sh',
- }
-
- cron { 'media_rsync':
- ensure => present,
- user => 'root',
- minute => '20',
- hour => '3',
- command => '/root/backups/rsync-media-cron.sh',
- environment => '[email protected]',
- }
-}
diff --git a/manifests/site.pp b/manifests/site.pp
index 02d82b7..b33e7f8 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1846,7 +1846,6 @@
include role::dataset::systemusers
include role::dataset::secondary
include role::download::wikimedia
-# include role::mirror::media
}
node 'ms1002.eqiad.wmnet' {
diff --git a/modules/dataset/manifests/common.pp
b/modules/dataset/manifests/common.pp
new file mode 100644
index 0000000..c0417cf
--- /dev/null
+++ b/modules/dataset/manifests/common.pp
@@ -0,0 +1,7 @@
+class dataset::common {
+ package { 'rsync':
+ ensure => present,
+ }
+
+ include vm::higher_min_free_kbytes
+}
diff --git a/modules/dataset/manifests/cron/kiwix.pp
b/modules/dataset/manifests/cron/kiwix.pp
index 07da9b5..d48192e 100644
--- a/modules/dataset/manifests/cron/kiwix.pp
+++ b/modules/dataset/manifests/cron/kiwix.pp
@@ -12,7 +12,7 @@
description => 'mirror of Kiwix files'
}
- include role::mirror::common
+ include dataset::common
group { 'mirror':
ensure => 'present',
diff --git a/modules/dataset/manifests/cron/rsync/labs.pp
b/modules/dataset/manifests/cron/rsync/labs.pp
index 2996068..def74b4 100644
--- a/modules/dataset/manifests/cron/rsync/labs.pp
+++ b/modules/dataset/manifests/cron/rsync/labs.pp
@@ -1,5 +1,5 @@
class dataset::cron::rsync::labs($enable=true) {
- include role::mirror::common
+ include dataset::common
if ($enable) {
$ensure = 'present'
diff --git a/modules/dataset/manifests/cron/rsync/peers.pp
b/modules/dataset/manifests/cron/rsync/peers.pp
index 4c46695..b077443 100644
--- a/modules/dataset/manifests/cron/rsync/peers.pp
+++ b/modules/dataset/manifests/cron/rsync/peers.pp
@@ -1,5 +1,5 @@
class dataset::cron::rsync::peers($enable=true) {
- include role::mirror::common
+ include dataset::common
if ($enable) {
$ensure = 'present'
diff --git a/modules/dataset/manifests/init.pp
b/modules/dataset/manifests/init.pp
index a93cf29..c7dc9e2 100644
--- a/modules/dataset/manifests/init.pp
+++ b/modules/dataset/manifests/init.pp
@@ -16,7 +16,7 @@
$grabs = {}
) {
- include role::mirror::common
+ include dataset::common
$rsync_public_enable = has_key($rsync,'public')
class { 'dataset::rsync::public': enable => $rsync_public_enable }
diff --git a/modules/dataset/manifests/rsync/pagecounts.pp
b/modules/dataset/manifests/rsync/pagecounts.pp
index d4ff319..f780c74 100644
--- a/modules/dataset/manifests/rsync/pagecounts.pp
+++ b/modules/dataset/manifests/rsync/pagecounts.pp
@@ -11,7 +11,7 @@
description => 'mirror of pagecount stats'
}
- include role::mirror::common
+ include dataset::common
include dataset::rsync::common
file { '/etc/rsyncd.d/30-rsync-pagecounts.conf':
diff --git a/modules/dataset/manifests/rsync/peers.pp
b/modules/dataset/manifests/rsync/peers.pp
index f2957a3..984729e 100644
--- a/modules/dataset/manifests/rsync/peers.pp
+++ b/modules/dataset/manifests/rsync/peers.pp
@@ -11,7 +11,7 @@
description => 'rsyncer to internal peers of dumps'
}
- include role::mirror::common
+ include dataset::common
include dataset::rsync::common
file { '/etc/rsyncd.d/10-rsync-datasets_to_peers.conf':
diff --git a/modules/dataset/manifests/rsync/public.pp
b/modules/dataset/manifests/rsync/public.pp
index f921f23..2ca1711 100644
--- a/modules/dataset/manifests/rsync/public.pp
+++ b/modules/dataset/manifests/rsync/public.pp
@@ -11,7 +11,7 @@
description => 'rsyncer to the public of dumps'
}
- include role::mirror::common
+ include dataset::common
include dataset::rsync::common
file { '/etc/rsyncd.d/20-rsync-dumps_to_public.conf':
ensure => $ensure,
--
To view, visit https://gerrit.wikimedia.org/r/185146
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9a45120bfdfae949f72e6f60cec132de137417e9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
