Lcarr has submitted this change and it was merged.
Change subject: Swap string "true" for boolean true in $ganglia_aggregator
......................................................................
Swap string "true" for boolean true in $ganglia_aggregator
Change-Id: Id8494b7b52b09b2d47fbdb501154f7951be295b6
---
M manifests/role/cache.pp
M manifests/site.pp
2 files changed, 63 insertions(+), 63 deletions(-)
Approvals:
Lcarr: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index ae35cad..9b28b73 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -370,7 +370,7 @@
}
# HTCP packet loss monitoring on the ganglia aggregators
- if $ganglia_aggregator == "true" and $::site != "esams"
{
+ if $ganglia_aggregator and $::site != "esams" {
include misc::monitoring::htcp-loss
}
}
diff --git a/manifests/site.pp b/manifests/site.pp
index 2b496bd..fc2c200 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -76,7 +76,7 @@
$cluster = "lvs"
if $hostname =~ /^amslvs[12]$/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
# Older PyBal is very dependent on recursive DNS, to the point where it
is a SPOF
@@ -114,7 +114,7 @@
node /amssq(3[1-9]|4[0-6])\.esams\.wikimedia\.org/ {
$squid_coss_disks = [ 'sda5', 'sdb5' ]
if $hostname =~ /^amssq3[12]$/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
include role::cache::text
@@ -142,7 +142,7 @@
node /analytics100[3456].eqiad.wmnet/ {
# ganglia aggregator for the Analytics cluster.
if ($hostname == "analytics1003") {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
include role::analytics
@@ -176,7 +176,7 @@
node /analytics10(0[79]|1[0-9]|2[0-6])\.eqiad\.wmnet/ {
# ganglia aggregator for the Analytics cluster.
if ($hostname == "analytics1011") {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
include role::analytics
@@ -211,7 +211,7 @@
node /(arsenic|niobium|strontium|palladium)\.(wikimedia\.org|eqiad\.wmnet)/ {
if $hostname =~ /^(arsenic|niobium)$/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
interface_aggregate { "bond0": orig_interface => "eth0", members => [
"eth0", "eth1", "eth2", "eth3" ] }
@@ -293,7 +293,7 @@
}
node "carbon.wikimedia.org" {
$cluster = "misc"
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
include standard,
backup::client,
@@ -310,7 +310,7 @@
node /^cp10(0[1-9]|1[0-9]|20)\.eqiad\.wmnet$/ {
$squid_coss_disks = [ 'sda5', 'sdb5' ]
if $hostname =~ /^cp100(1|2)$/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
include role::cache::text
@@ -318,7 +318,7 @@
node /^cp10(2[1-9]|3[0-6])\.eqiad\.wmnet$/ {
if $hostname =~ /^cp102[12]$/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
interface_aggregate { "bond0": orig_interface => "eth0", members => [
"eth0", "eth1" ] }
@@ -334,7 +334,7 @@
node /^cp104[1-4]\.(wikimedia\.org|eqiad\.wmnet)$/ {
if $hostname =~ /^cp104(3|4)$/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
interface_add_ip6_mapped { "main": }
@@ -353,7 +353,7 @@
node /^cp30(0[3-9]|10)\.esams\.wikimedia\.org$/ {
if $::hostname =~ /^cp300[34]$/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
interface_add_ip6_mapped { "main": }
@@ -363,7 +363,7 @@
node /^cp(3019|302[0-2])\.esams\.wikimedia\.org$/ {
if $::hostname =~ /^cp(3019|3020)$/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
interface_add_ip6_mapped { "main": }
@@ -436,7 +436,7 @@
node /^db(31|33|51|65|72)\.pmtpa\.wmnet/ {
if $hostname =~ /^db51/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
if $hostname == "db51" {
class { role::coredb::s4 : mariadb => true }
@@ -459,7 +459,7 @@
node /^db(43|46|47|50)\.pmtpa\.wmnet/ {
if $hostname =~ /^db50/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
if $hostname == "db43" {
class { role::coredb::s6 : mariadb => true }
@@ -541,7 +541,7 @@
# eqiad dbs
node /^db10(17|42|43|49|50|51|52|56)\.eqiad\.wmnet/ {
if $hostname =~ /^db10(01|17|56)/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
include mha::manager
}
@@ -580,7 +580,7 @@
node /^db10(05|21|26|39|58)\.eqiad\.wmnet/ {
if $hostname =~ /^db1021/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
if $hostname =~ /^db10(05|21|26|58)/ {
@@ -756,7 +756,7 @@
}
node /(ersch|tarin)\.pmtpa\.wmnet/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
include standard,
role::poolcounter
}
@@ -964,7 +964,7 @@
}
node "hooft.esams.wikimedia.org" {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
$domain_search = "esams.wikimedia.org wikimedia.org esams.wmnet"
include standard,
@@ -1068,7 +1068,7 @@
}
node "hooper.wikimedia.org" {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
include standard,
admins::roots,
@@ -1162,7 +1162,7 @@
node /knsq(1[6-9]|2[0-2])\.esams\.wikimedia\.org/ {
$squid_coss_disks = [ 'sdb5', 'sdc', 'sdd' ]
if $hostname =~ /^knsq1[67]$/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
include role::cache::upload
@@ -1243,7 +1243,7 @@
$cluster = "gluster"
$ldapincludes = ['openldap', 'nss', 'utils']
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
include standard,
openstack::project-storage
@@ -1261,7 +1261,7 @@
$cluster = "labsnfs"
$ldapincludes = ['openldap', 'nss', 'utils']
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
include standard
@@ -1300,7 +1300,7 @@
$cluster = "lvs"
if $hostname =~ /^lvs[12]$/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
# Older PyBal is very dependent on recursive DNS, to the point where it
is a SPOF
@@ -1377,7 +1377,7 @@
$cluster = "lvs"
if $hostname =~ /^lvs100[12]$/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
# Older PyBal is very dependent on recursive DNS, to the point where it
is a SPOF
@@ -1586,7 +1586,7 @@
node /^mc(1[0-9]|[0-9])\.pmtpa\.wmnet/ {
$cluster = "memcached"
if $hostname =~ /^mc[12]$/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
case $::mw_primary {
@@ -1636,7 +1636,7 @@
node /^mc(10[01][0-9])\.eqiad\.wmnet/ {
$cluster = "memcached"
if $hostname =~ /^mc100[12]$/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
case $::mw_primary {
@@ -1682,7 +1682,7 @@
}
node /^rdb100[12]\.eqiad\.wmnet/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
$redis_replication = {
'rdb1002' => 'rdb1001'
@@ -1748,7 +1748,7 @@
node /ms100[4]\.eqiad\.wmnet/ {
$cluster = "misc"
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
$thumbs_proxying = "true"
$thumbs_proxy_source = "http://10.0.0.252";
@@ -1760,7 +1760,7 @@
node /^ms-fe[1-4]\.pmtpa\.wmnet$/ {
if $hostname =~ /^ms-fe[12]$/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
if $hostname =~ /^ms-fe1$/ {
include role::swift::pmtpa-prod::ganglia_reporter
@@ -1842,7 +1842,7 @@
$cluster = "ceph"
if $hostname =~ /^ms-fe100[12]$/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
class { "lvs::realserver": realserver_ips => [ "10.2.2.27" ] }
@@ -1859,7 +1859,7 @@
$cluster = "ceph"
if $::hostname =~ /^ms-be300[12]$/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
include standard
@@ -1868,7 +1868,7 @@
# mw1-16 are application servers for jobrunners only (precise)
node /^mw([1-9]|1[0-6])\.pmtpa\.wmnet$/ {
if $::hostname =~ /^mw[12]$/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
class { role::applicationserver::jobrunner: run_jobs_enabled => false
}
@@ -1894,7 +1894,7 @@
# mw75-80 are imagescalers (precise)
node /^mw(7[5-9]|80)\.pmtpa\.wmnet$/ {
if $::hostname =~ /^mw7[56]$/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
include role::applicationserver::imagescaler
@@ -1921,7 +1921,7 @@
# mw1001-1016 are jobrunners (precise)
node /^mw10(0[1-9]|1[0-6])\.eqiad\.wmnet$/ {
if $::hostname =~ /^mw100[12]$/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
class { role::applicationserver::jobrunner: run_jobs_enabled => true }
@@ -1930,7 +1930,7 @@
# mw1017-1113 are apaches (precise)
node /^mw1(01[7-9]|0[2-9][0-9]|10[0-9]|11[0-3])\.eqiad\.wmnet$/ {
if $::hostname =~ /^mw101[78]$/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
include role::applicationserver::appserver
@@ -1939,7 +1939,7 @@
# mw1114-1148 are api apaches (precise)
node /^mw11(1[4-9]|[23][0-9]|4[0-8])\.eqiad\.wmnet$/ {
if $::hostname =~ /^mw111[45]$/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
include role::applicationserver::appserver::api
@@ -1948,7 +1948,7 @@
# mw1149-1152 are bits apaches (precise)
node /^mw11(49|5[0-2])\.eqiad\.wmnet$/ {
if $::hostname =~ /^mw115[12]$/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
include role::applicationserver::appserver::bits
@@ -1957,7 +1957,7 @@
# mw1153-1160 are imagescalers (precise)
node /^mw11(5[3-9]|60)\.eqiad\.wmnet$/ {
if $::hostname =~ /^mw115[34]$/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
include role::applicationserver::imagescaler
@@ -2035,7 +2035,7 @@
}
node "nickel.wikimedia.org" {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
include standard,
ganglia::web,
@@ -2136,7 +2136,7 @@
$cluster = "payments"
if $hostname =~ /^payments[12]$/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
system_role { "misc::payments": description => "Fundraising payments
server" }
@@ -2164,7 +2164,7 @@
}
node "pdf1.wikimedia.org" {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
$cluster = "pdf"
include role::pdf,
@@ -2173,7 +2173,7 @@
}
node "pdf2.wikimedia.org" {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
$cluster = "pdf"
include role::pdf,
@@ -2228,7 +2228,7 @@
node /search1[3478]\.pmtpa\.wmnet/ {
if $hostname =~ /^search1(3|4)$/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
include role::lucene::front_end::pool4
@@ -2261,7 +2261,7 @@
node /search100[0-6]\.eqiad\.wmnet/ {
if $hostname =~ /^search100(1|2)$/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
include role::lucene::front_end::pool1
@@ -2381,7 +2381,7 @@
}
node "spence.wikimedia.org" {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
include standard,
nfs::netapp::home,
@@ -2407,14 +2407,14 @@
# srv248-249 are bits application servers (precise)
node /^srv24[89]\.pmtpa\.wmnet$/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
include role::applicationserver::appserver::bits
}
# srv250-257 are API application servers (precise)
node /^srv25[0-7]\.pmtpa\.wmnet$/ {
if $hostname =~ /^srv25[45]$/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
include role::applicationserver::appserver::api
include nfs::upload
@@ -2423,7 +2423,7 @@
# srv258-289 are applicationservers (precise)
node /^srv(25[89]|2[6-8][0-9])\.pmtpa\.wmnet$/ {
if $hostname =~ /^srv25[89]$/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
include role::applicationserver::appserver
@@ -2438,7 +2438,7 @@
node /ssl[1-4]\.wikimedia\.org/ {
if $hostname =~ /^ssl[12]$/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
include role::protoproxy::ssl
@@ -2448,7 +2448,7 @@
node /ssl100[1-4]\.wikimedia\.org/ {
if $hostname =~ /^ssl100[12]$/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
interface_add_ip6_mapped { "main": interface => "eth0" }
@@ -2458,7 +2458,7 @@
node /ssl300[1-4]\.esams\.wikimedia\.org/ {
if $hostname =~ /^ssl300[12]$/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
interface_add_ip6_mapped { "main": interface => "eth0" }
@@ -2470,7 +2470,7 @@
node /sq(3[1-6])\.wikimedia\.org/ {
$squid_coss_disks = [ 'sda5', 'sdb5', 'sdc', 'sdd' ]
if $hostname =~ /^sq3[15]$/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
include role::cache::text
}
@@ -2487,7 +2487,7 @@
node /sq(4[1-9]|50)\.wikimedia\.org/ {
$squid_coss_disks = [ 'sdb5', 'sdc', 'sdd' ]
if $hostname =~ /^sq4[12]$/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
include role::cache::upload
@@ -2503,7 +2503,7 @@
node /sq(59|6[0-6])\.wikimedia\.org/ {
$squid_coss_disks = [ 'sda5', 'sdb5' ]
if $hostname =~ /^sq(59|60)$/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
include role::cache::text
@@ -2512,7 +2512,7 @@
# sq67-70 are varnishes for bits.wikimedia.org
node /sq(6[7-9]|70)\.wikimedia\.org/ {
if $hostname =~ /^sq6[68]$/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
interface_aggregate { "bond0":
@@ -2722,7 +2722,7 @@
# tmh1/tmh2 video encoding server (precise only)
node /^tmh[1-2]\.pmtpa\.wmnet/ {
if $hostname =~ /^tmh[12]$/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
class { role::applicationserver::videoscaler: run_jobs_enabled => false
}
@@ -2733,7 +2733,7 @@
# tmh1001/tmh1002 video encoding server (precise only)
node /^tmh100[1-2]\.eqiad\.wmnet/ {
if $hostname =~ /^tmh100[12]$/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
class { role::applicationserver::videoscaler: run_jobs_enabled => true }
@@ -2803,7 +2803,7 @@
$cluster = "virt"
if $hostname =~ /^virt[56]$/ {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
$openstack_version = "essex"
@@ -2815,7 +2815,7 @@
node /virt100(5|7|8).eqiad.wmnet/ {
#$cluster = "virt"
#if $hostname =~ /^virt100[57]$/ {
- # $ganglia_aggregator = "true"
+ # $ganglia_aggregator = true
#}
include standard
@@ -2842,7 +2842,7 @@
$nagios_group = "${cluster}_$::site"
if $hostname == "wtp1" {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
include standard,
@@ -2859,11 +2859,11 @@
$nagios_group = "${cluster}_$::site"
if $hostname == "constable" {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
if $hostname == "cerium" {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
include standard,
@@ -2882,7 +2882,7 @@
$nagios_group = "${cluster}_$::site"
if $hostname == "wtp1001" {
- $ganglia_aggregator = "true"
+ $ganglia_aggregator = true
}
include standard,
--
To view, visit https://gerrit.wikimedia.org/r/59613
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id8494b7b52b09b2d47fbdb501154f7951be295b6
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Demon <[email protected]>
Gerrit-Reviewer: Lcarr <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
