Elukey has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/374332 )
Change subject: stat1003: remove puppet configuration as part of decom
......................................................................
stat1003: remove puppet configuration as part of decom
Bug: T152712
Change-Id: I0f94905ec66df58a0175f9a55e65408abcae6702
---
M hieradata/common.yaml
M hieradata/role/common/dumps/server.yaml
M manifests/site.pp
M modules/admin/data/data.yaml
M modules/dataset/files/rsync/rsyncd.conf.media
M modules/dataset/files/rsync/rsyncd.conf.pagecounts_ez
M modules/role/manifests/statistics/cruncher.pp
M modules/statistics/manifests/rsync/eventlogging.pp
M modules/statistics/manifests/wmde/graphite.pp
9 files changed, 19 insertions(+), 50 deletions(-)
Approvals:
Muehlenhoff: Looks good to me, but someone else must approve
Elukey: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 9f8d0d0..a415be3 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -292,7 +292,6 @@
puppetmaster: "puppet"
active_labstore_host: 'labstore1001'
statistics_servers:
- - stat1003.eqiad.wmnet
- stat1004.eqiad.wmnet
- stat1005.eqiad.wmnet
- stat1006.eqiad.wmnet
@@ -304,7 +303,6 @@
- snapshot1006.eqiad.wmnet
- snapshot1007.eqiad.wmnet
dataset_clients_other:
- - stat1003.eqiad.wmnet
- stat1005.eqiad.wmnet
- stat1006.eqiad.wmnet
dumps_clients_snapshots:
diff --git a/hieradata/role/common/dumps/server.yaml
b/hieradata/role/common/dumps/server.yaml
index 0d095dc..4fcef6d 100644
--- a/hieradata/role/common/dumps/server.yaml
+++ b/hieradata/role/common/dumps/server.yaml
@@ -4,7 +4,6 @@
- mwlog2001.codfw.wmnet
- phab1001.eqiad.wmnet
- ms1001.wikimedia.org
- - stat1003.eqiad.wmnet
- stat1005.eqiad.wmnet
- stat1006.eqiad.wmnet
- sagres.c3sl.ufpr.br
diff --git a/manifests/site.pp b/manifests/site.pp
index 7f21ceb..f4b91ce 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1864,7 +1864,6 @@
# Experimental Jupyter notebook servers
node 'notebook1001.eqiad.wmnet' {
- # Equivalent of stat1003
role(paws_internal::jupyterhub, paws_internal::mysql_access)
include ::standard
@@ -2197,12 +2196,9 @@
role(failoid)
}
-# stat1003 is a general purpose number cruncher for
-# researchers and analysts. It is primarily used
-# to connect to MySQL research databases and save
-# query results for further processing on this node.
+# To be fully decom as part of T152712
node 'stat1003.eqiad.wmnet' {
- role(statistics::cruncher)
+ role(spare::system)
}
node 'stat1004.eqiad.wmnet' {
diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index c5cdb0c..cc10ff3 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -108,7 +108,7 @@
gid: 714
description: Access statistics number crunching hosts (like
statistics-users) and also provides access to research mysql
- credentials on stat1003 (currently the only such host)
+ credentials on stat1006 (currently the only such host)
members: [awight, bmansurov, catrope, dartar, deskana,
dduvall, ezachte, gilles, halfak,
jforrester, jkatz, jmorgan, kaldari,
diff --git a/modules/dataset/files/rsync/rsyncd.conf.media
b/modules/dataset/files/rsync/rsyncd.conf.media
index 37a3062..2873208 100644
--- a/modules/dataset/files/rsync/rsyncd.conf.media
+++ b/modules/dataset/files/rsync/rsyncd.conf.media
@@ -3,12 +3,12 @@
### puppet:///modules/dataset/rsync/rsyncd.conf.media
#####################################################################
-# write access from stat1003 to media directory.
+# write access from stat100[4,5] to media directory.
# Erik Z uses this.
[media]
uid = datasets
gid = wikidev
read only = false
path = /data/xmldatadumps/public/other/media
-hosts allow = stat1003.eqiad.wmnet stat1005.eqiad.wmnet stat1006.eqiad.wmnet
+hosts allow = stat1005.eqiad.wmnet stat1006.eqiad.wmnet
diff --git a/modules/dataset/files/rsync/rsyncd.conf.pagecounts_ez
b/modules/dataset/files/rsync/rsyncd.conf.pagecounts_ez
index 221d08b..29254cd 100644
--- a/modules/dataset/files/rsync/rsyncd.conf.pagecounts_ez
+++ b/modules/dataset/files/rsync/rsyncd.conf.pagecounts_ez
@@ -2,12 +2,12 @@
### Note: This file is managed by Puppet.
#####################################################################
-# write access from stat1003 to pagecounts-ez directory.
+# write access from stat100[4,5] 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 = stat1003.eqiad.wmnet stat1005.eqiad.wmnet stat1006.eqiad.wmnet
+hosts allow = stat1005.eqiad.wmnet stat1006.eqiad.wmnet
diff --git a/modules/role/manifests/statistics/cruncher.pp
b/modules/role/manifests/statistics/cruncher.pp
index ae8922c..fbc8bfc 100644
--- a/modules/role/manifests/statistics/cruncher.pp
+++ b/modules/role/manifests/statistics/cruncher.pp
@@ -1,4 +1,3 @@
-# (stat1003)
class role::statistics::cruncher {
system::role { 'statistics::cruncher':
description => 'Statistics general compute node (non private data)'
diff --git a/modules/statistics/manifests/rsync/eventlogging.pp
b/modules/statistics/manifests/rsync/eventlogging.pp
index 1bee18d..f3e39c4 100644
--- a/modules/statistics/manifests/rsync/eventlogging.pp
+++ b/modules/statistics/manifests/rsync/eventlogging.pp
@@ -11,26 +11,13 @@
# the rsync_job define.
$retention_days = 90
- # TODO: remove these conditionals after stat1003 is gone.
- $destination = $::hostname ? {
- 'stat1003' => '/srv/eventlogging/archive',
- default => '/srv/log/eventlogging/archive',
- }
- if $destination == '/srv/log/eventlogging/archive' {
- file { ['/srv/log/eventlogging', '/srv/log/eventlogging/archive']:
- ensure => 'directory',
- owner => 'stats',
- group => 'wikidev',
- mode => '0775',
- }
- }
- else {
- file { "${working_path}/eventlogging":
- ensure => 'directory',
- owner => 'stats',
- group => 'wikidev',
- mode => '0775',
- }
+ $destination = '/srv/log/eventlogging/archive'
+
+ file { ['/srv/log/eventlogging', '/srv/log/eventlogging/archive']:
+ ensure => 'directory',
+ owner => 'stats',
+ group => 'wikidev',
+ mode => '0775',
}
# eventlogging data logs from eventlog1001
diff --git a/modules/statistics/manifests/wmde/graphite.pp
b/modules/statistics/manifests/wmde/graphite.pp
index ec94904..d04185f 100644
--- a/modules/statistics/manifests/wmde/graphite.pp
+++ b/modules/statistics/manifests/wmde/graphite.pp
@@ -28,21 +28,11 @@
# Path in which all crons will log to.
$log_dir = "${dir}/log"
- # TODO: remove after stat1003 is gone: T152712
- if os_version('debian >= stretch') {
- require_package('openjdk-8-jdk')
- require_package(
- 'php',
- 'php-cli',
- )
- }
- else {
- require_package('openjdk-7-jdk')
- require_package(
- 'php5',
- 'php5-cli',
- )
- }
+ require_package('openjdk-8-jdk')
+ require_package(
+ 'php',
+ 'php-cli',
+ )
include ::passwords::mysql::research
# This file will render at
--
To view, visit https://gerrit.wikimedia.org/r/374332
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0f94905ec66df58a0175f9a55e65408abcae6702
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Elukey <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
