ArielGlenn has submitted this change and it was merged.
Change subject: remove obsolete manifests from snapshot module/role
......................................................................
remove obsolete manifests from snapshot module/role
also include role::snapshot::common everywhere it should be
Change-Id: Id3deb3814afccb584ac7f68d58cfd6977b707e78
---
M modules/role/manifests/snapshot/common.pp
D modules/role/manifests/snapshot/cron/primary.pp
D modules/role/manifests/snapshot/cron/secondary.pp
M modules/role/manifests/snapshot/cronrunner.pp
M modules/role/manifests/snapshot/dumper.pp
D modules/role/manifests/snapshot/dumps/hugewikis.pp
D modules/role/manifests/snapshot/dumps/monitor.pp
D modules/role/manifests/snapshot/dumps/regularwikis.pp
M modules/role/manifests/snapshot/monitor.pp
D modules/role/manifests/snapshot/producer.pp
D modules/snapshot/manifests/dumps/cron/huge.pp
D modules/snapshot/manifests/dumps/cron/rest.pp
D modules/snapshot/manifests/init.pp
13 files changed, 3 insertions(+), 121 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/role/manifests/snapshot/common.pp
b/modules/role/manifests/snapshot/common.pp
index 941765c..5e6c4f3 100644
--- a/modules/role/manifests/snapshot/common.pp
+++ b/modules/role/manifests/snapshot/common.pp
@@ -1,10 +1,5 @@
class role::snapshot::common {
include ::dataset::user
include base::firewall
-
- # Allow SSH from deployment hosts
- ferm::rule { 'deployment-ssh':
- rule => 'proto tcp dport ssh saddr $DEPLOYMENT_HOSTS ACCEPT;',
- }
}
diff --git a/modules/role/manifests/snapshot/cron/primary.pp
b/modules/role/manifests/snapshot/cron/primary.pp
deleted file mode 100644
index 4ad67d0..0000000
--- a/modules/role/manifests/snapshot/cron/primary.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-class role::snapshot::cron::primary {
- include role::snapshot::common
-
-}
-
diff --git a/modules/role/manifests/snapshot/cron/secondary.pp
b/modules/role/manifests/snapshot/cron/secondary.pp
deleted file mode 100644
index 6c82312..0000000
--- a/modules/role/manifests/snapshot/cron/secondary.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-class role::snapshot::cron::secondary {
- include role::snapshot::common
-
-}
-
diff --git a/modules/role/manifests/snapshot/cronrunner.pp
b/modules/role/manifests/snapshot/cronrunner.pp
index 1a99e19..9d298ea 100644
--- a/modules/role/manifests/snapshot/cronrunner.pp
+++ b/modules/role/manifests/snapshot/cronrunner.pp
@@ -2,6 +2,7 @@
# dump related cron jobs OTHER THAN the full xml/sql
# dumps
class role::snapshot::cronrunner {
+ include role::snapshot::common
if hiera('snapshot::cron::misc', false) {
# mw packages and dependencies, dataset server nfs mount
diff --git a/modules/role/manifests/snapshot/dumper.pp
b/modules/role/manifests/snapshot/dumper.pp
index 87af64f..821f89a 100644
--- a/modules/role/manifests/snapshot/dumper.pp
+++ b/modules/role/manifests/snapshot/dumper.pp
@@ -1,6 +1,7 @@
# this class is for snapshot hosts that run regular dumps
# meaning sql/xml dumps every couple of weeks or so
class role::snapshot::dumper {
+ include role::snapshot::common
# mw packages and dependencies, dataset server nfs mount
include snapshot::dumps::packages
diff --git a/modules/role/manifests/snapshot/dumps/hugewikis.pp
b/modules/role/manifests/snapshot/dumps/hugewikis.pp
deleted file mode 100644
index 34474ec..0000000
--- a/modules/role/manifests/snapshot/dumps/hugewikis.pp
+++ /dev/null
@@ -1,7 +0,0 @@
-class role::snapshot::dumps::hugewikis {
- include role::snapshot::common
- class { 'snapshot::dumps::cron::huge':
- user => 'datasets',
- }
-}
-
diff --git a/modules/role/manifests/snapshot/dumps/monitor.pp
b/modules/role/manifests/snapshot/dumps/monitor.pp
deleted file mode 100644
index dade7b3..0000000
--- a/modules/role/manifests/snapshot/dumps/monitor.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-class role::snapshot::dumps::monitor {
- include role::snapshot::common
-
- include ::snapshot
- include ::snapshot::dumps::monitor
-
- system::role { 'role::snapshot::dumps::monitor':
- description => 'monitor of XML dumps',
- }
-}
-
diff --git a/modules/role/manifests/snapshot/dumps/regularwikis.pp
b/modules/role/manifests/snapshot/dumps/regularwikis.pp
deleted file mode 100644
index 503ece1..0000000
--- a/modules/role/manifests/snapshot/dumps/regularwikis.pp
+++ /dev/null
@@ -1,7 +0,0 @@
-class role::snapshot::dumps::regularwikis {
- include role::snapshot::common
- class { 'snapshot::dumps::cron::rest':
- user => 'datasets',
- }
-}
-
diff --git a/modules/role/manifests/snapshot/monitor.pp
b/modules/role/manifests/snapshot/monitor.pp
index 8ea3ee4..2fe9e19 100644
--- a/modules/role/manifests/snapshot/monitor.pp
+++ b/modules/role/manifests/snapshot/monitor.pp
@@ -1,4 +1,5 @@
class role::snapshot::monitor {
+ include role::snapshot::common
if hiera('snapshot::dumps::monitor', false) {
# mw packages and dependencies, dataset server nfs mount
diff --git a/modules/role/manifests/snapshot/producer.pp
b/modules/role/manifests/snapshot/producer.pp
deleted file mode 100644
index ef35ab0..0000000
--- a/modules/role/manifests/snapshot/producer.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-class role::snapshot::producer {
- include role::snapshot::common
-
- include ::snapshot
- include ::snapshot::dumps
-
- system::role { 'role::snapshot::producer':
- description => 'producer of XML dumps',
- }
-}
-
diff --git a/modules/snapshot/manifests/dumps/cron/huge.pp
b/modules/snapshot/manifests/dumps/cron/huge.pp
deleted file mode 100644
index 9c3ce2c..0000000
--- a/modules/snapshot/manifests/dumps/cron/huge.pp
+++ /dev/null
@@ -1,19 +0,0 @@
-class snapshot::dumps::cron::huge(
- $enable = true,
- $user = undef,
-) {
- include snapshot::dumps::dirs
- include snapshot::dumps::cron
-
- # fixme there is an implicit dependency on
- # $dumpsdir/confs/wikidump.conf.* plus some stage files, make explicit
- cron { 'fulldumps_huge':
- ensure => 'present',
- environment => '[email protected]',
- user => $user,
- command => '/usr/local/bin/fulldumps.sh 01 14 hugewikis
>/dev/null',
- minute => '05',
- hour => '02',
- monthday => '05-14',
- }
-}
diff --git a/modules/snapshot/manifests/dumps/cron/rest.pp
b/modules/snapshot/manifests/dumps/cron/rest.pp
deleted file mode 100644
index 3375d2f..0000000
--- a/modules/snapshot/manifests/dumps/cron/rest.pp
+++ /dev/null
@@ -1,19 +0,0 @@
-class snapshot::dumps::cron::rest(
- $enable = true,
- $user = undef,
-) {
- include snapshot::dumps::dirs
- include snapshot::dumps::cron
-
- # fixme there is an implicit dependency on
- # $dumpsdir/confs/wikidump.conf.* plus some stage files, make explicit
- cron { 'fulldumps_rest':
- ensure => 'present',
- environment => '[email protected]',
- user => $user,
- command => '/usr/local/bin/fulldumps.sh 01 14 regular > /dev/null',
- minute => '05',
- hour => '02',
- monthday => '05-14',
- }
-}
diff --git a/modules/snapshot/manifests/init.pp
b/modules/snapshot/manifests/init.pp
deleted file mode 100644
index d45b570..0000000
--- a/modules/snapshot/manifests/init.pp
+++ /dev/null
@@ -1,32 +0,0 @@
-class snapshot {
- include ::mediawiki
- include mediawiki::nutcracker
- include mediawiki::scap
-
- require_package('mwbzutils')
- require_package('mysql-client')
- require_package('p7zip-full')
- require_package('subversion')
- require_package('utfnormal')
-
- require_package('nfs-common')
-
- file { [ '/mnt/data' ]:
- ensure => 'directory',
- }
-
- $datasetserver = $::site ? {
- 'eqiad' => 'dataset1001.wikimedia.org',
- default => 'dataset1001.wikimedia.org',
- }
-
- mount { '/mnt/data':
- ensure => 'mounted',
- device => "${datasetserver}:/data",
- fstype => 'nfs',
- name => '/mnt/data',
- options => 'bg,hard,tcp,rsize=8192,wsize=8192,intr,nfsvers=3',
- require => File['/mnt/data'],
- remounts => false,
- }
-}
--
To view, visit https://gerrit.wikimedia.org/r/301132
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id3deb3814afccb584ac7f68d58cfd6977b707e78
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <[email protected]>
Gerrit-Reviewer: ArielGlenn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
