Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: Move cluster definition to the node level.
......................................................................
Move cluster definition to the node level.
We happen to use the $cluster variable for a few reasons, mainly for
ganglia but also for other things. I will remove all declarations below
node-level as they don't work well with puppet 3; for now I just added
it at node level for testing purposes.
This should not interfere with any functionality however.
Change-Id: I5bd8cea283e1f196378c8ad956b69b1d3be34065
Signed-off-by: Giuseppe Lavagetto <glavage...@wikimedia.org>
---
M manifests/role/applicationserver.pp
M manifests/role/cache.pp
M manifests/site.pp
3 files changed, 82 insertions(+), 20 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/applicationserver.pp
b/manifests/role/applicationserver.pp
index 24d265f..206e5a8 100644
--- a/manifests/role/applicationserver.pp
+++ b/manifests/role/applicationserver.pp
@@ -37,7 +37,7 @@
# - $group:
# Determines what logical group the host will be a
# part of. Used for ganglia. Possibilities are:
-# appserver, api_appserver, bits_appserver, imagescaler, jobrunner
+# appserver, api_appserver, bits_appserver, imagescaler, jobrunner,
videoscaler
# - $lvs_pool:
# Determines lvsrealserver IP(s) that the host will receive.
# From lvs::configuration::$lvs_service_ips
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 8524863..e6315c1 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -1012,7 +1012,7 @@
}
$storage_size_main = $::realm ? { 'labs' => 5, default => 300 }
-
+
if $cluster_tier == 1 {
$director_retries = 2
} else {
diff --git a/manifests/site.pp b/manifests/site.pp
index c73e024..ddc1c31 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -60,6 +60,7 @@
$ganglia_aggregator = true
}
+ $cluster = 'lvs'
include role::lvs::balancer
interface::add_ip6_mapped { 'main':
@@ -76,6 +77,7 @@
# amssq47 is a text varnish
node /^amssq47\.esams\.wikimedia\.org$/ {
+ $cluster = 'cache_text'
include role::cache::text
include role::cache::ssl::unified
@@ -91,6 +93,7 @@
}
}
+ $cluster = 'cache_text'
include role::cache::text
interface::add_ip6_mapped { 'main': }
@@ -401,7 +404,7 @@
}
interface::add_ip6_mapped { 'main': }
-
+ $cluster = 'cache_text'
include role::cache::text
}
@@ -410,6 +413,7 @@
interface::add_ip6_mapped { 'main': }
+ $cluster = 'cache_misc'
include role::cache::misc
}
@@ -418,6 +422,7 @@
interface::add_ip6_mapped { 'main': }
+ $cluster = 'cache_parsoid'
include role::cache::parsoid
include admins::parsoid
}
@@ -429,6 +434,7 @@
interface::add_ip6_mapped { 'main': }
+ $cluster = 'cache_parsoid'
include role::cache::mobile
}
@@ -439,6 +445,7 @@
interface::add_ip6_mapped { 'main': }
+ $cluster = 'cache_upload'
include role::cache::upload
}
@@ -449,6 +456,7 @@
interface::add_ip6_mapped { 'main': }
+ $cluster = 'cache_text'
include role::cache::text
}
@@ -459,6 +467,7 @@
interface::add_ip6_mapped { 'main': }
+ $cluster = 'cache_bits'
include role::cache::bits
}
@@ -479,7 +488,7 @@
if $::hostname =~ /^cp300[34]$/ {
$ganglia_aggregator = true
}
-
+ $cluster = 'cache_upload'
interface::add_ip6_mapped { 'main': }
include role::cache::upload
@@ -488,6 +497,7 @@
node /^cp301[1-4]\.esams\.(wikimedia\.org|wmnet)$/ {
interface::add_ip6_mapped { 'main': }
+ $cluster = 'cache_mobile'
include role::cache::mobile
}
@@ -498,6 +508,7 @@
interface::add_ip6_mapped { 'main': }
+ $cluster = 'cache_bits'
include role::cache::bits
}
@@ -514,6 +525,7 @@
interface::add_ip6_mapped { 'main': }
+ $cluster = 'cache_bits'
include role::cache::bits
include role::cache::ssl::unified
}
@@ -525,6 +537,7 @@
interface::add_ip6_mapped { 'main': }
+ $cluster = 'cache_upload'
include role::cache::upload
include role::cache::ssl::unified
}
@@ -536,6 +549,7 @@
interface::add_ip6_mapped { 'main': }
+ $cluster = 'cache_text'
include role::cache::text
include role::cache::ssl::unified
}
@@ -547,6 +561,7 @@
interface::add_ip6_mapped { 'main': }
+ $cluster = 'cache_mobile'
include role::cache::mobile
include role::cache::ssl::unified
}
@@ -577,6 +592,7 @@
# pmtpa dbs
node /^db(60)\.pmtpa\.wmnet/ {
+ $cluster = 'mysql'
$ganglia_aggregator = true
class { 'role::coredb::s1':
mariadb => true,
@@ -585,6 +601,7 @@
}
node /^db(69)\.pmtpa\.wmnet/ {
+ $cluster = 'mysql'
class { 'role::coredb::s2':
mariadb => true,
innodb_file_per_table => true,
@@ -592,6 +609,7 @@
}
node /^db(71)\.pmtpa\.wmnet/ {
+ $cluster = 'mysql'
class { 'role::coredb::s3':
mariadb => true,
innodb_file_per_table => true,
@@ -599,6 +617,7 @@
}
node /^db(72)\.pmtpa\.wmnet/ {
+ $cluster = 'mysql'
class { 'role::coredb::s4':
mariadb => true,
innodb_file_per_table => true,
@@ -606,6 +625,7 @@
}
node /^db(73)\.pmtpa\.wmnet/ {
+ $cluster = 'mysql'
class { 'role::coredb::s5':
mariadb => true,
innodb_file_per_table => true,
@@ -613,6 +633,7 @@
}
node /^db(74)\.pmtpa\.wmnet/ {
+ $cluster = 'mysql'
class { 'role::coredb::s6':
mariadb => true,
innodb_file_per_table => true,
@@ -626,6 +647,7 @@
# eqiad dbs
node /^db10(43|50|51|52|55|56|61|62)\.eqiad\.wmnet/ {
+ $cluster = 'mysql'
class { 'role::coredb::s1':
innodb_file_per_table => true,
mariadb => true,
@@ -633,6 +655,7 @@
}
node /^db10(02|09|18|36|60|63)\.eqiad\.wmnet/ {
+ $cluster = 'mysql'
class { 'role::coredb::s2':
innodb_file_per_table => true,
mariadb => true,
@@ -640,6 +663,7 @@
}
node /^db10(03|19|35|38)\.eqiad\.wmnet/ {
+ $cluster = 'mysql'
class { 'role::coredb::s3':
# Many more tables than other shards.
# innodb_file_per_table=off to reduce file handles.
@@ -649,6 +673,7 @@
}
node /^db10(04|11|40|42|49|59)\.eqiad\.wmnet/ {
+ $cluster = 'mysql'
class { 'role::coredb::s4':
innodb_file_per_table => true,
mariadb => true,
@@ -659,6 +684,7 @@
if $::hostname =~ /^db1021/ {
$ganglia_aggregator = true
}
+ $cluster = 'mysql'
class { 'role::coredb::s5':
innodb_file_per_table => true,
mariadb => true,
@@ -666,6 +692,7 @@
}
node /^db10(06|10|15|22|23|30)\.eqiad\.wmnet/ {
+ $cluster = 'mysql'
class { 'role::coredb::s6':
innodb_file_per_table => true,
mariadb => true,
@@ -673,6 +700,7 @@
}
node /^db10(07|28|33|34|39|41)\.eqiad\.wmnet/ {
+ $cluster = 'mysql'
class { 'role::coredb::s7':
innodb_file_per_table => true,
mariadb => true,
@@ -681,11 +709,13 @@
## x1 shard
node /^db10(29|31)\.eqiad\.wmnet/ {
+ $cluster = 'mysql'
include role::coredb::x1
}
## m1 shard
node /^db10(01|16)\.eqiad\.wmnet/ {
+ $cluster = 'mysql'
class { 'role::coredb::m1':
mariadb => true,
}
@@ -693,6 +723,7 @@
## m2 shard
node /^db104[68]\.eqiad\.wmnet/ {
+ $cluster = 'mysql'
if $::hostname =~ /^db1048/ {
$ganglia_aggregator = true
}
@@ -707,11 +738,13 @@
## researchdb s1
node 'db1047.eqiad.wmnet' {
+ $cluster = 'mysql'
include role::mariadb::analytics
}
## researchdb s5
node 'db1017.eqiad.wmnet' {
+ $cluster = 'mysql'
class { 'role::coredb::researchdb':
shard => 's5',
mariadb => true,
@@ -722,6 +755,7 @@
## SANITARIUM
node 'db1053.eqiad.wmnet' {
+ $cluster = 'mysql'
class { 'role::db::sanitarium':
instances => {
's1' => {
@@ -737,6 +771,7 @@
}
node 'db1054.eqiad.wmnet' {
+ $cluster = 'mysql'
class { 'role::db::sanitarium':
instances => {
's2' => {
@@ -768,6 +803,7 @@
}
node 'db1057.eqiad.wmnet' {
+ $cluster = 'mysql'
class { 'role::db::sanitarium':
instances => {
's3' => {
@@ -800,10 +836,12 @@
}
node 'db1044.eqiad.wmnet' {
+ $cluster = 'mysql'
include role::mariadb::tendril
}
node /^dbstore100(1|2)\.eqiad\.wmnet/ {
+ $cluster = 'mysql'
include role::mariadb::dbstore
}
@@ -863,6 +901,7 @@
}
node 'aluminium.wikimedia.org' {
+ $cluster = 'fundraising'
include role::fundraising::civicrm
include accounts::file_mover
@@ -881,22 +920,26 @@
# es1 equad
node /es100[1-4]\.eqiad\.wmnet/ {
+ $cluster = 'mysql'
class { 'role::coredb::es1':
mariadb => true,
}
}
node /es4\.pmtpa\.wmnet/ {
+ $cluster = 'mysql'
include role::coredb::es1
}
# es2-3
node /es7\.pmtpa\.wmnet/ {
- include role::coredb::es2
+ $cluster = 'mysql'
+ include role::coredb::es2
}
node /es8\.pmtpa\.wmnet/ {
- include role::coredb::es3
+ $cluster = 'mysql'
+ include role::coredb::es3
}
## imminent decomission/reclaim from pmtpa pending 12th floor reorg
@@ -905,6 +948,7 @@
}
node /es100[5-7]\.eqiad\.wmnet/ {
+ $cluster = 'mysql'
if $::hostname =~ /^es100[67]/ {
class { 'role::coredb::es2':
mariadb => true,
@@ -915,6 +959,7 @@
}
node /es10(0[89]|10)\.eqiad\.wmnet/ {
+ $cluster = 'mysql'
if $::hostname =~ /^es10(09|10)/ {
class { 'role::coredb::es3':
mariadb => true,
@@ -1183,6 +1228,7 @@
## labsdb dbs
node 'labsdb1001.eqiad.wmnet' {
+ $cluster = 'mysql'
class { 'role::db::labsdb':
instances => {
's1' => {
@@ -1200,6 +1246,7 @@
}
node 'labsdb1002.eqiad.wmnet' {
+ $cluster = 'mysql'
class { 'role::db::labsdb':
instances => {
's2' => {
@@ -1243,6 +1290,7 @@
}
node 'labsdb1003.eqiad.wmnet' {
+ $cluster = 'mysql'
class { 'role::db::labsdb':
instances => {
's3' => {
@@ -1387,7 +1435,7 @@
if $::hostname =~ /^lvs100[25]$/ {
$nameservers_prefix = [ '208.80.154.157', '208.80.154.50' ]
}
-
+ $cluster = 'lvs'
include role::lvs::balancer
interface::add_ip6_mapped { 'main':
@@ -1513,7 +1561,7 @@
# if $::hostname =~ /^lvs300[13]$/ {
# $ganglia_aggregator = true
# }
-
+ $cluster = 'lvs'
include role::lvs::balancer
interface::add_ip6_mapped { 'main':
@@ -1547,6 +1595,7 @@
# ULSFO lvs servers
node /^lvs400[1-4]\.ulsfo\.wmnet$/ {
+ $cluster = 'lvs'
# lvs4001 and lvs4003 are in different racks
if $::hostname =~ /^lvs400[13]$/ {
$ganglia_aggregator = true
@@ -1606,6 +1655,7 @@
}
node /^rdb100[1-4]\.eqiad\.wmnet/ {
+ $cluster = 'redis'
$ganglia_aggregator = true
$redis_replication = {
@@ -1693,6 +1743,7 @@
# new server IP as a trusted proxy so X-Forwarded-For headers are trusted for
# rate limiting purposes (bug 64622)
node /^ms-fe100[1-4]\.eqiad\.wmnet$/ {
+ $cluster = 'swift'
if $::hostname =~ /^ms-fe100[12]$/ {
$ganglia_aggregator = true
}
@@ -1706,6 +1757,7 @@
}
node /^ms-be10[0-9][0-9]\.eqiad\.wmnet$/ {
+ $cluster = 'swift'
$all_drives = [
'/dev/sda', '/dev/sdb', '/dev/sdc', '/dev/sdd',
'/dev/sde', '/dev/sdf', '/dev/sdg', '/dev/sdh',
@@ -1727,6 +1779,7 @@
}
node /^ms-be300[1-4]\.esams\.wmnet$/ {
+ $cluster = 'swift'
# 720xd *without* SSDs; sda & sdb serve both as root and as Swift disks
$all_drives = [
'/dev/sdc', '/dev/sdd', '/dev/sde', '/dev/sdf',
@@ -1747,6 +1800,7 @@
# mw1001-1016 are jobrunners (precise)
node /^mw10(0[1-9]|1[0-6])\.eqiad\.wmnet$/ {
+ $cluster = 'jobrunner'
if $::hostname =~ /^mw100[12]$/ {
$ganglia_aggregator = true
}
@@ -1763,6 +1817,7 @@
# mw1017-1113 are apaches (precise)
node /^mw1(01[7-9]|0[2-9][0-9]|10[0-9]|11[0-3])\.eqiad\.wmnet$/ {
+ $cluster = 'appserver'
if $::hostname =~ /^mw101[78]$/ {
$ganglia_aggregator = true
}
@@ -1782,6 +1837,7 @@
# mw1114-1148 are api apaches (precise)
node /^mw11(1[4-9]|[23][0-9]|4[0-8])\.eqiad\.wmnet$/ {
+ $cluster = 'api_appserver'
if $::hostname =~ /^mw111[45]$/ {
$ganglia_aggregator = true
}
@@ -1791,6 +1847,7 @@
# mw1149-1152 are bits apaches (precise)
node /^mw11(49|5[0-2])\.eqiad\.wmnet$/ {
+ $cluster = 'bits_appserver'
if $::hostname =~ /^mw115[12]$/ {
$ganglia_aggregator = true
}
@@ -1800,6 +1857,7 @@
# mw1153-1160 are imagescalers (precise)
node /^mw11(5[3-9]|60)\.eqiad\.wmnet$/ {
+ $cluster = 'imagescaler'
if $::hostname =~ /^mw115[34]$/ {
$ganglia_aggregator = true
}
@@ -1809,7 +1867,7 @@
# mw1161-1188 are apaches (precise)
node /^mw11(6[1-9]|7[0-9]|8[0-8])\.eqiad\.wmnet$/ {
-
+ $cluster = 'appserver'
if $::hostname == 'mw1161' {
include misc::deployment::scap_proxy
}
@@ -1819,7 +1877,7 @@
# mw1189-1208 are api apaches (precise)
node /^mw1(189|19[0-9]|20[0-8])\.eqiad\.wmnet$/ {
-
+ $cluster = 'api_appserver'
if $::hostname == 'mw1201' {
include misc::deployment::scap_proxy
}
@@ -1829,7 +1887,7 @@
# mw1209-1220 are apaches (precise)
node /^mw12(09|1[0-9]|20)\.eqiad\.wmnet$/ {
-
+ $cluster = 'appserver'
include role::applicationserver::appserver
}
@@ -2011,7 +2069,7 @@
}
node /pc100[1-3]\.eqiad\.wmnet/ {
-
+ $cluster = 'mysql'
include role::db::core
include mysql_wmf::mysqluser
include mysql_wmf::datadirs
@@ -2082,6 +2140,7 @@
}
node /^search100[0-6]\.eqiad\.wmnet/ {
+ $cluster = 'search'
if $::hostname =~ /^search100(1|2)$/ {
$ganglia_aggregator = true
}
@@ -2090,42 +2149,42 @@
}
node /^search10(0[7-9]|10)\.eqiad\.wmnet/ {
-
+ $cluster = 'search'
include role::lucene::front_end::pool2
}
node /^search101[1-4]\.eqiad\.wmnet/ {
-
+ $cluster = 'search'
include role::lucene::front_end::pool3
}
node /^search101[56]\.eqiad\.wmnet/ {
-
+ $cluster = 'search'
include role::lucene::front_end::pool4
}
node /^search10(19|20)\.eqiad\.wmnet/ {
-
+ $cluster = 'search'
include role::lucene::front_end::pool5
}
node /^search101[78]\.eqiad\.wmnet/ {
-
+ $cluster = 'search'
include role::lucene::front_end::prefix
}
node /^search10(19|2[0-2])\.eqiad\.wmnet/ {
-
+ $cluster = 'search'
include role::lucene::front_end::pool4
}
node /^search102[3-4]\.eqiad\.wmnet/ {
-
+ $cluster = 'search'
include role::lucene::front_end::pool3
}
node /^searchidx100[0-2]\.eqiad\.wmnet/ {
-
+ $cluster = 'search'
include role::lucene::indexer
}
@@ -2193,6 +2252,7 @@
}
node /ssl100[1-9]\.wikimedia\.org/ {
+ $cluster = 'ssl'
if $::hostname =~ /^ssl100[12]$/ {
$ganglia_aggregator = true
}
@@ -2205,6 +2265,7 @@
}
node /ssl300[1-4]\.esams\.wikimedia\.org/ {
+ $cluster = 'ssl'
if $::hostname =~ /^ssl300[12]$/ {
$ganglia_aggregator = true
}
@@ -2516,6 +2577,7 @@
# tmh1001/tmh1002 video encoding server (precise only)
node /^tmh100[1-2]\.eqiad\.wmnet/ {
+ $cluster = 'videoscaler'
if $::hostname =~ /^tmh100[12]$/ {
$ganglia_aggregator = true
}
--
To view, visit https://gerrit.wikimedia.org/r/130591
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5bd8cea283e1f196378c8ad956b69b1d3be34065
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Matanya <mata...@foss.co.il>
Gerrit-Reviewer: coren <mpellet...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
