Ottomata has submitted this change and it was merged.
Change subject: Puppetize thorium as stat1001 replacement
......................................................................
Puppetize thorium as stat1001 replacement
This sets up rsync jobs and sites on thorium, but does not change any
cache routing.
Bug: T149438
Change-Id: Iffc7da6bd886a64d8ff918d005a8e7640053739c
---
M manifests/site.pp
M modules/role/manifests/statistics/base.pp
2 files changed, 26 insertions(+), 5 deletions(-)
Approvals:
Ottomata: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 402cd78..fae8575 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2610,6 +2610,8 @@
}
}
+
+# stat1001 is being replaced by thorium: T149438
node 'stat1001.eqiad.wmnet' {
# stat1001 is mainly used to host Analytics websites like:
# - https://stats.wikimedia.org (Wikistats)
@@ -2629,6 +2631,25 @@
include base::firewall
}
+node 'thorium.eqiad.wmnet' {
+ # thorium is mainly used to host Analytics websites like:
+ # - https://stats.wikimedia.org (Wikistats)
+ # - https://datasets.wikimedia.org
+ # - https://metrics.wikimedia.org (https://metrics.wmflabs.org/
(Wikimetrics))
+ # - https://pivot.wikimedia.org (Imply's Pivot UI for Druid data)
+ #
+ # For a complete and up to date list please check the
+ # related role/module.
+ #
+ # This node is not intended for data processing.
+ role(statistics::web,
+ analytics_cluster::druid::pivot)
+
+
+ include standard
+ include base::firewall
+}
+
node 'stat1002.eqiad.wmnet' {
# stat1002 is intended to be the private
# webrequest access log storage host.
diff --git a/modules/role/manifests/statistics/base.pp
b/modules/role/manifests/statistics/base.pp
index 31e52e8..eb1c815 100644
--- a/modules/role/manifests/statistics/base.pp
+++ b/modules/role/manifests/statistics/base.pp
@@ -7,6 +7,7 @@
$statistics_servers = hiera(
'statistics_servers',
[
+ 'thorium.eqiad.wmnet',
'stat1001.eqiad.wmnet',
'stat1002.eqiad.wmnet',
'stat1003.eqiad.wmnet',
@@ -14,13 +15,12 @@
]
)
- # we are attempting to stop using /a and to start using
+ # We are attempting to stop using /a and to start using
# /srv instead. stat1002 still use
- # /a by default. # stat1001 and stat1003 use /srv.
+ # /a. Everything else uses /srv.
$working_path = $::hostname ? {
- 'stat1001' => '/srv',
- 'stat1003' => '/srv',
- default => '/a',
+ 'stat1002' => '/a',
+ default => '/srv',
}
class { '::statistics':
--
To view, visit https://gerrit.wikimedia.org/r/324234
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iffc7da6bd886a64d8ff918d005a8e7640053739c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[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
