[MediaWiki-commits] [Gerrit] Move cluster definition to the node level. - change (operations/puppet)
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
[MediaWiki-commits] [Gerrit] Move cluster definition to the node level. - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130591
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(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/91/130591/1
diff --git a/manifests/role/applicationserver.pp
b/manifests/role/applicationserver.pp
index c361dcd..6f9c4df 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 44efefd..b6e22de 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -1000,7 +1000,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 444d801..e6a3833 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': }
@@ -398,7 +401,7 @@
}
interface::add_ip6_mapped { 'main': }
-
+$cluster = 'cache_text'
include role::cache::text
}
@@ -407,6 +410,7 @@
interface::add_ip6_mapped { 'main': }
+$cluster = cache_misc
include role::cache::misc
}
@@ -415,6 +419,7 @@
interface::add_ip6_mapped { 'main': }
+$cluster = cache_parsoid
include role::cache::parsoid
include admins::parsoid
}
@@ -426,6 +431,7 @@
interface::add_ip6_mapped { 'main': }
+$cluster = cache_parsoid
include role::cache::mobile
}
@@ -436,6 +442,7 @@
interface::add_ip6_mapped { 'main': }
+$cluster = cache_upload
include role::cache::upload
}
@@ -446,6 +453,7 @@
interface::add_ip6_mapped { 'main': }
+$cluster = cache_text
include role::cache::text
}
@@ -456,6 +464,7 @@
interface::add_ip6_mapped { 'main': }
+$cluster = 'cache_bits'
include role::cache::bits
}
@@ -485,6 +494,7 @@
node /^cp301[1-4]\.esams\.(wikimedia\.org|wmnet)$/ {
interface::add_ip6_mapped { 'main': }
+$cluster = cache_mobile
include role::cache::mobile
}
@@ -495,6 +505,7 @@
interface::add_ip6_mapped { 'main': }
+$cluster = cache_bits
include role::cache::bits
}
@@ -511,6 +522,7 @@
interface::add_ip6_mapped { 'main': }
+$cluster = cache_bits
include role::cache::bits
include role::cache::ssl::unified
}
@@ -522,6 +534,7 @@
interface::add_ip6_mapped { 'main': }
+$cluster = cache_upload
include role::cache::upload
include role::cache::ssl::unified
}
@@ -533,6 +546,7 @@
interface::add_ip6_mapped { 'main': }
+$cluster = cache_text
include role::cache::text
include role::cache::ssl::unified
}
@@ -544,6 +558,7 @@
interface::add_ip6_mapped { 'main': }
+$cluster = cache_mobile
include role::cache::mobile
include role::cache::ssl::unified
}
@@ -574,6 +589,7 @@
# pmtpa dbs
node /^db(60)\.pmtpa\.wmnet/ {
+$cluster = 'mysql'
$ganglia_aggregator = true
class { 'role::coredb::s1':
mariadb = true,
@@ -582,6 +598,7 @@
}
node /^db(69)\.pmtpa\.wmnet/ {
+$cluster = 'mysql'
class { 'role::coredb::s2':
mariadb = true,
innodb_file_per_table = true,
@@ -589,6 +606,7 @@
}
node /^db(71)\.pmtpa\.wmnet/ {
+$cluster = 'mysql'
class {
