Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/246827
Change subject: dataset: remove system::role from the dataset module
......................................................................
dataset: remove system::role from the dataset module
Add system::role to the dataset roles and remove it from classes of the
dataset module. They don't belong there and under no definition of a
role is a cronjob a role.
Change-Id: Ibb7027f280b8c6253691e8ed581af569cd143fb1
---
M manifests/role/dataset.pp
M modules/dataset/manifests/cron/kiwix.pp
M modules/dataset/manifests/cron/pagecountsraw.pp
M modules/dataset/manifests/cron/rsync/labs.pp
M modules/dataset/manifests/nfs.pp
M modules/dataset/manifests/rsync/pagecounts.pp
M modules/dataset/manifests/rsync/peers.pp
M modules/dataset/manifests/rsync/phab_dump.pp
M modules/dataset/manifests/rsync/public.pp
9 files changed, 8 insertions(+), 40 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/27/246827/1
diff --git a/manifests/role/dataset.pp b/manifests/role/dataset.pp
index d748006..f1e98d9 100644
--- a/manifests/role/dataset.pp
+++ b/manifests/role/dataset.pp
@@ -4,6 +4,10 @@
# of content may or may not be generated here (but should all be eventually)
# mirrors to the public should not be provided from here via rsync
class role::dataset::primary {
+ system::role { 'role::dataset::primary':
+ description => 'dataset primary host',
+ }
+
$rsync = {
'public' => true,
'peers' => true,
@@ -47,6 +51,10 @@
# number of directories (but best is not at all)
# mirrors to the public should be provided from here via rsync
class role::dataset::secondary {
+ system::role { 'role::dataset::secondary':
+ description => 'dataset secondary host',
+ }
+
$rsync = {
'public' => true,
'peers' => true,
diff --git a/modules/dataset/manifests/cron/kiwix.pp
b/modules/dataset/manifests/cron/kiwix.pp
index b00c309..64b0b0a 100644
--- a/modules/dataset/manifests/cron/kiwix.pp
+++ b/modules/dataset/manifests/cron/kiwix.pp
@@ -7,11 +7,6 @@
$ensure = 'absent'
}
- system::role { 'dataset::cron::kiwix':
- ensure => $ensure,
- description => 'mirror of Kiwix files'
- }
-
include dataset::common
group { 'mirror':
diff --git a/modules/dataset/manifests/cron/pagecountsraw.pp
b/modules/dataset/manifests/cron/pagecountsraw.pp
index d04f0a0..d9802cc 100644
--- a/modules/dataset/manifests/cron/pagecountsraw.pp
+++ b/modules/dataset/manifests/cron/pagecountsraw.pp
@@ -10,11 +10,6 @@
else {
$ensure = 'absent'
}
- system::role { 'dataset::cron::pagecountsraw':
- ensure => $ensure,
- description => 'server of raw page view stats'
- }
-
file { '/usr/local/bin/daily-pagestats-copy.sh':
mode => '0755',
owner => 'root',
diff --git a/modules/dataset/manifests/cron/rsync/labs.pp
b/modules/dataset/manifests/cron/rsync/labs.pp
index def74b4..4eb6989 100644
--- a/modules/dataset/manifests/cron/rsync/labs.pp
+++ b/modules/dataset/manifests/cron/rsync/labs.pp
@@ -8,11 +8,6 @@
$ensure = 'absent'
}
- system::role { 'dataset::cron::rsync::labs':
- ensure => $ensure,
- description => 'rsyncer of dumps to labs fs'
- }
-
file { '/mnt/dumps':
ensure => directory,
owner => 'root',
diff --git a/modules/dataset/manifests/nfs.pp b/modules/dataset/manifests/nfs.pp
index 2f5adb9..bb28134 100644
--- a/modules/dataset/manifests/nfs.pp
+++ b/modules/dataset/manifests/nfs.pp
@@ -9,11 +9,6 @@
$role_ensure = 'absent'
}
- system::role { 'dataset::nfs':
- ensure => $role_ensure,
- description => 'nfs server of dumps and other datasets'
- }
-
file { '/etc/exports':
mode => '0444',
owner => 'root',
diff --git a/modules/dataset/manifests/rsync/pagecounts.pp
b/modules/dataset/manifests/rsync/pagecounts.pp
index f780c74..70fba08 100644
--- a/modules/dataset/manifests/rsync/pagecounts.pp
+++ b/modules/dataset/manifests/rsync/pagecounts.pp
@@ -6,11 +6,6 @@
$ensure = 'absent'
}
- system::role { 'dataset::rsync::pagecounts':
- ensure => $ensure,
- description => 'mirror of pagecount stats'
- }
-
include dataset::common
include dataset::rsync::common
diff --git a/modules/dataset/manifests/rsync/peers.pp
b/modules/dataset/manifests/rsync/peers.pp
index 984729e..957bebd 100644
--- a/modules/dataset/manifests/rsync/peers.pp
+++ b/modules/dataset/manifests/rsync/peers.pp
@@ -6,11 +6,6 @@
$ensure = 'absent'
}
- system::role { 'dataset::rsync::peers':
- ensure => $ensure,
- description => 'rsyncer to internal peers of dumps'
- }
-
include dataset::common
include dataset::rsync::common
diff --git a/modules/dataset/manifests/rsync/phab_dump.pp
b/modules/dataset/manifests/rsync/phab_dump.pp
index e421015..d663db1 100644
--- a/modules/dataset/manifests/rsync/phab_dump.pp
+++ b/modules/dataset/manifests/rsync/phab_dump.pp
@@ -6,11 +6,6 @@
$ensure = 'absent'
}
- system::role { 'dataset::rsync::phab_dump':
- ensure => $ensure,
- description => 'mirror of phabricator dump'
- }
-
include dataset::common
include dataset::rsync::common
diff --git a/modules/dataset/manifests/rsync/public.pp
b/modules/dataset/manifests/rsync/public.pp
index 2ca1711..80b696f 100644
--- a/modules/dataset/manifests/rsync/public.pp
+++ b/modules/dataset/manifests/rsync/public.pp
@@ -6,11 +6,6 @@
$ensure = 'absent'
}
- system::role { 'dataset::rsync::public':
- ensure => $ensure,
- description => 'rsyncer to the public of dumps'
- }
-
include dataset::common
include dataset::rsync::common
file { '/etc/rsyncd.d/20-rsync-dumps_to_public.conf':
--
To view, visit https://gerrit.wikimedia.org/r/246827
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb7027f280b8c6253691e8ed581af569cd143fb1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
