BBlack has submitted this change and it was merged.
Change subject: remove amssq* refs from site.pp and cache role stuff
......................................................................
remove amssq* refs from site.pp and cache role stuff
Change-Id: I6b6a93a714cb56760a6e293898b24f9355ed3e19
---
M manifests/misc/monitoring.pp
M manifests/role/cache.pp
M manifests/site.pp
3 files changed, 14 insertions(+), 32 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/misc/monitoring.pp b/manifests/misc/monitoring.pp
index 4f101af..2b8de04 100644
--- a/manifests/misc/monitoring.pp
+++ b/manifests/misc/monitoring.pp
@@ -392,7 +392,7 @@
# == Define misc::monitoring::view::varnishkafka
#
-define misc::monitoring::view::varnishkafka($varnishkafka_host_regex =
'(amssq|cp).+', $topic_regex = '.+', $ensure = 'present') {
+define misc::monitoring::view::varnishkafka($varnishkafka_host_regex = 'cp.+',
$topic_regex = '.+', $ensure = 'present') {
ganglia_new::web::view { "varnishkafka-${title}":
ensure => $ensure,
graphs => [
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index e6361c5..893ce43 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -829,20 +829,20 @@
if $::realm == 'production' {
$storage_size_main = $::hostname ? {
- /^(amssq[0-9][0-9]|cp10(08|4[34]))$/ => 117, # Intel X-25M 160G
- /^cp30(0[3-9]|1[0-4])$/ => 460, # Intel M320 600G
via H710
- /^cp301[5-8]$/ => 225, # Intel M320 300G
via H710
- default => 360, # Intel S3700 400G
+ /^cp10(08|4[34])$/ => 117, # Intel X-25M 160G
+ /^cp30(0[3-9]|1[0-4])$/ => 460, # Intel M320 600G via H710
+ /^cp301[5-8]$/ => 225, # Intel M320 300G via H710
+ default => 360, # Intel S3700 400G
}
- # This scales backend weights proportional to node storage size,
with the
- # default value of 100 corresponding to the most common/current
case
- # of 360G storage size on Intel S3700's.
+ # This scales backend weights proportional to node storage size,
+ # with the default value of 100 corresponding to the most
+ # common/current case of 360G storage size on Intel S3700's.
$backend_scaled_weights = [
- { backend_match => '^(amssq[0-9][0-9]|cp10(08|4[34]))\.',
weight => 32 },
- { backend_match => '^cp30(0[3-9]|1[0-4])\.',
weight => 128 },
- { backend_match => '^cp301[5-8]\.',
weight => 63 },
- { backend_match => '.',
weight => 100 },
+ { backend_match => '^cp10(08|4[34])\.', weight => 32 },
+ { backend_match => '^cp30(0[3-9]|1[0-4])\.', weight => 128 },
+ { backend_match => '^cp301[5-8]\.', weight => 63 },
+ { backend_match => '.', weight => 100 },
]
# These variables are unused, they just serve as documentation of
@@ -855,11 +855,8 @@
# weight ratios, which are created from 'openssl speed aes-128-cbc'
# for 1K blocksize multiplied by CPU core count then GCD-scaled
# down within each datacenter to keep weight sums below ipvs sh
- # limits (256 total). (amssq would actually be 0.83 at esams
- # scale; fudged it to keep abs values smaller, will decom soon
- # anyways).
+ # limits (256 total).
$pybal_weight_esams_upload_text = [
- '^amssq' => 1,
'^cp30[34][0-9]' => 10, # newer esams cp30xx
'^cp30(0[3-9]|1[0-8])' => 3, # older esams cp30xx
]
@@ -939,10 +936,7 @@
}
$storage_conf = $::realm ? {
- 'production' => $::hostname ? {
- /^amssq(4[7-9]|[56][0-9])$/ => "-s
main2=persistent,/srv/sdb3/varnish.main2,${storage_size_main}G,$mma0", # sda is
an HDD, sdb is an SSD
- default => "-s
main1=persistent,/srv/sda3/varnish.main1,${storage_size_main}G,$mma0 -s
main2=persistent,/srv/sdb3/varnish.main2,${storage_size_main}G,$mma1",
- },
+ 'production' => "-s
main1=persistent,/srv/sda3/varnish.main1,${storage_size_main}G,$mma0 -s
main2=persistent,/srv/sdb3/varnish.main2,${storage_size_main}G,$mma1",
'labs' => "-s
main1=persistent,/srv/vdb/varnish.main1,${storage_size_main}G,$mma0 -s
main2=persistent,/srv/vdb/varnish.main2,${storage_size_main}G,$mma1",
}
diff --git a/manifests/site.pp b/manifests/site.pp
index f59eb4d..644057a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -60,18 +60,6 @@
}
}
-# amssq31-62 are text varnish (and the only nodes with this legacy prefix)
-node /^amssq[0-9]+\.esams\.(wmnet|wikimedia\.org)$/ {
- sysctl::parameters { 'vm dirty page flushes':
- values => {
- 'vm.dirty_background_ratio' => 5,
- }
- }
- role cache::text
- interface::add_ip6_mapped { 'main': }
-}
-
-
# analytics1003 is being used for testing kafkatee
# in preperation for replacing udp2log
node 'analytics1003.eqiad.wmnet' {
--
To view, visit https://gerrit.wikimedia.org/r/203386
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6b6a93a714cb56760a6e293898b24f9355ed3e19
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
