Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/350107 )
Change subject: site/icinga: unify einsteinium/tegmen in single node section
......................................................................
site/icinga: unify einsteinium/tegmen in single node section
Both hosts are using identical roles (now) and combining nodes
in site.pp saves some lines, makes it more obvious these servers
are supposed to be (and stay) identical and should prevent changes
where we put a misc role on just one of 2 servers while forgetting
the equivalent in the other DC. (it has worked pretty good doing
this for maintenance servers for example)
Change-Id: I1ba6a91dd13149cbd164761a9740bf3384eabc29
---
M manifests/site.pp
1 file changed, 2 insertions(+), 7 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index bd595b0..a3804d4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -917,8 +917,8 @@
include ::standard
}
-# icinga based monitoring host in eqiad
-node 'einsteinium.wikimedia.org' {
+# icinga based monitoring hosts (einsteinium = eqiad, tegmen = codfw)
+node 'einsteinium.wikimedia.org', 'tegmen.wikimedia.org' {
role(icinga, tendril, tcpircbot, certspotter)
}
@@ -2667,11 +2667,6 @@
node /(subra|suhail)\.codfw\.wmnet/ {
role(poolcounter::server)
include ::standard
-}
-
-# icinga based monitoring host in codfw
-node 'tegmen.wikimedia.org' {
- role(icinga, tendril, tcpircbot, certspotter)
}
# https://wikitech.wikimedia.org/wiki/Terbium
--
To view, visit https://gerrit.wikimedia.org/r/350107
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1ba6a91dd13149cbd164761a9740bf3384eabc29
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
