Dzahn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/224191

Change subject: site.pp - add comments about server roles
......................................................................

site.pp - add comments about server roles

Change-Id: If36f75a82128c69f5e521dc3d5da91e842667d8d
---
M manifests/site.pp
1 file changed, 29 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/91/224191/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 5be9eaa..7064f3b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -220,6 +220,7 @@
     include role::authdns::server
 }
 
+# Bastion in Virginia
 node 'bast1001.wikimedia.org' {
 
     interface::add_ip6_mapped { 'main':
@@ -239,6 +240,7 @@
     }
 }
 
+# Bastion in Texas
 node 'bast2001.wikimedia.org' {
     interface::add_ip6_mapped { 'main':
         interface => 'eth0',
@@ -248,6 +250,7 @@
 
 }
 
+# Bastion in California
 node 'bast4001.wikimedia.org' {
     interface::add_ip6_mapped { 'main':
         interface => 'eth0',
@@ -947,6 +950,7 @@
     }
 }
 
+# Etherpad (virtual machine)
 node 'etherpad1001.eqiad.wmnet' {
     include base::firewall
     include role::etherpad
@@ -982,6 +986,7 @@
 
 }
 
+# ZIM dumps (https://en.wikipedia.org/wiki/ZIM_%28file_format%29)
 node 'francium.eqiad.wmnet' {
 
     role dumps::zim
@@ -1000,6 +1005,7 @@
     include role::logging::relay::eventlogging
 }
 
+# Continuous Integration
 node 'gallium.wikimedia.org' {
 
     $cluster = 'misc'
@@ -1034,6 +1040,7 @@
     }
 }
 
+# Virtualization hosts
 node /^ganeti[12]00[0-9]\.(codfw|eqiad)\.wmnet$/ {
     role ganeti
     include standard
@@ -1051,6 +1058,7 @@
     include role::webperf
 }
 
+# poolcounter - careful
 node 'helium.eqiad.wmnet' {
     include standard
     include role::poolcounter
@@ -1058,6 +1066,7 @@
     include role::backup::storage
 }
 
+# Bacula storage
 node 'heze.codfw.wmnet' {
     include standard
     include role::backup::storage
@@ -1075,6 +1084,7 @@
     include ldap::role::client::labs
 }
 
+# bastion in the Netherlands
 node 'hooft.esams.wikimedia.org' {
     $ganglia_aggregator = true
 
@@ -1132,6 +1142,7 @@
     }
 }
 
+# ticket.wikimedia.org
 node 'iodine.wikimedia.org' {
     include base::firewall
     role otrs
@@ -1141,6 +1152,7 @@
     }
 }
 
+# Phabricator
 node 'iridium.eqiad.wmnet' {
     interface::add_ip6_mapped { 'main':
         interface => 'eth0',
@@ -1330,6 +1342,7 @@
 
 }
 
+# secondary mailserver
 node 'lead.wikimedia.org' {
     role mail::mx
     include standard
@@ -1630,6 +1643,7 @@
     }
 }
 
+# RT and the other RT
 node 'magnesium.wikimedia.org' {
 
     $cluster = 'misc'
@@ -1686,6 +1700,7 @@
     include standard
 }
 
+# also see dataset1001
 node 'ms1001.wikimedia.org' {
     $cluster = 'misc'
 
@@ -1935,6 +1950,7 @@
     include ldap::role::client::labs
 }
 
+# Icinga
 node 'neon.wikimedia.org' {
     include base::firewall
 
@@ -1965,6 +1981,7 @@
     }
 }
 
+# network monitoring tool server
 node 'netmon1001.wikimedia.org' {
     include standard
     include webserver::apache
@@ -1995,6 +2012,7 @@
     }
 }
 
+# Offline Content Generator
 node /^ocg100[123]\.eqiad\.wmnet$/ {
     role ocg
 }
@@ -2015,6 +2033,7 @@
     include standard
 }
 
+# primary puppet master
 node 'palladium.eqiad.wmnet' {
     include standard
     include role::ipmi
@@ -2031,11 +2050,13 @@
     include role::mariadb::parsercache
 }
 
+# virtual machine hosting 
https://wikitech.wikimedia.org/wiki/Planet.wikimedia.org
 node 'planet1001.eqiad.wmnet' {
     include base::firewall
     include role::planet
 }
 
+# LDAP servers relied on by OIT for mail
 node /(plutonium|pollux)\.wikimedia\.org/ {
     $cluster = 'openldap_corp_mirror'
 
@@ -2044,6 +2065,7 @@
     include base::firewall
 }
 
+# primary mail server
 node 'polonium.wikimedia.org' {
     role mail::mx
     include standard
@@ -2063,6 +2085,7 @@
     }
 }
 
+# careful when moving poolcounters
 node 'potassium.eqiad.wmnet' {
     include standard
     include role::poolcounter
@@ -2076,6 +2099,7 @@
     include base::firewall
 }
 
+# Tor relay
 node 'radium.wikimedia.org' {
     include base::firewall
     include standard
@@ -2250,6 +2274,7 @@
     include role::poolcounter
 }
 
+# https://wikitech.wikimedia.org/wiki/Terbium
 node 'terbium.eqiad.wmnet' {
     include role::mediawiki::common
     include role::db::maintenance
@@ -2367,15 +2392,18 @@
     }
 }
 
+# https://www.mediawiki.org/wiki/Parsoid
 node /^wtp10(0[1-9]|1[0-9]|2[0-4])\.eqiad\.wmnet$/ {
     role parsoid::production
 }
 
+# https://www.mediawiki.org/wiki/Parsoid
 node /^wtp20(0[1-9]|1[0-9]|2[0-4])\.codfw\.wmnet$/ {
     role parsoid::production
     include standard
 }
 
+# https://www.mediawiki.org/wiki/Gerrit
 node 'ytterbium.wikimedia.org' {
     # Note: whenever moving Gerrit out of ytterbium, you will need
     # to update the role::zuul::production
@@ -2385,6 +2413,7 @@
 
 }
 
+# https://wikitech.wikimedia.org/wiki/Zirconium
 node 'zirconium.wikimedia.org' {
     include base::firewall
     include standard

-- 
To view, visit https://gerrit.wikimedia.org/r/224191
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If36f75a82128c69f5e521dc3d5da91e842667d8d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to