BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/268226
Change subject: cache_mobile LVS decom: 1/2 remove LVS service
......................................................................
cache_mobile LVS decom: 1/2 remove LVS service
Note: this moves the actual IPs to the text service definition
Note: this requires careful manual deployment with puppet disabled
on LVSes and text caches initially at merge time!
Bug: T109286
Change-Id: Id6c195fcf32aac9f16f6901814b1049b72eacd82
---
M hieradata/common/lvs/configuration.yaml
M modules/role/manifests/cache/text.pp
M modules/role/manifests/lvs/balancer.pp
3 files changed, 9 insertions(+), 72 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/26/268226/1
diff --git a/hieradata/common/lvs/configuration.yaml
b/hieradata/common/lvs/configuration.yaml
index 9343990..240d3d5 100644
--- a/hieradata/common/lvs/configuration.yaml
+++ b/hieradata/common/lvs/configuration.yaml
@@ -4,18 +4,26 @@
textlb: 208.80.153.224
textlb6: 2620:0:860:ed1a::1
geoiplookuplb: 208.80.153.225
+ mobilelb: 208.80.153.236
+ mobilelb6: 2620:0:860:ed1a::1:c
eqiad:
textlb: 208.80.154.224
textlb6: 2620:0:861:ed1a::1
geoiplookuplb: 208.80.154.225
+ mobilelb: 208.80.154.236
+ mobilelb6: 2620:0:861:ed1a::1:c
esams:
textlb: 91.198.174.192
textlb6: 2620:0:862:ed1a::1
geoiplookuplb: 91.198.174.193
+ mobilelb: 91.198.174.204
+ mobilelb6: 2620:0:862:ed1a::1:c
ulsfo:
textlb: 198.35.26.96
textlb6: 2620:0:863:ed1a::1
geoiplookuplb: 198.35.26.97
+ mobilelb: 198.35.26.108
+ mobilelb6: 2620:0:863:ed1a::1:c
upload: &ip_block002
codfw:
uploadlb: 208.80.153.240
@@ -42,19 +50,6 @@
api: &ip_block009
eqiad: 10.2.2.22
codfw: 10.2.1.22
- mobile: &ip_block004
- codfw:
- mobilelb: 208.80.153.236
- mobilelb6: 2620:0:860:ed1a::1:c
- eqiad:
- mobilelb: 208.80.154.236
- mobilelb6: 2620:0:861:ed1a::1:c
- esams:
- mobilelb: 91.198.174.204
- mobilelb6: 2620:0:862:ed1a::1:c
- ulsfo:
- mobilelb: 198.35.26.108
- mobilelb6: 2620:0:863:ed1a::1:c
swift: &ip_block010
eqiad: 10.2.2.27
codfw: 10.2.1.27
@@ -261,58 +256,6 @@
max-delay: 300
conftool:
cluster: cache_maps
- service: nginx
- mobile:
- description: MediaWiki based mobile site
- class: high-traffic1
- sites:
- - codfw
- - eqiad
- - esams
- - ulsfo
- ip: *ip_block004
- bgp: 'yes'
- depool-threshold: '.6'
- monitors:
- IdleConnection:
- timeout-clean-reconnect: 3
- max-delay: 300
- conftool:
- cluster: cache_mobile
- service: varnish-fe
- icinga:
- uri: en.m.wikipedia.org!/wiki/Special:BlankPage
- sites:
- eqiad:
- hostname: mobile-lb.eqiad.wikimedia.org
- codfw:
- hostname: mobile-lb.codfw.wikimedia.org
- esams:
- hostname: mobile-lb.esams.wikimedia.org
- ulsfo:
- hostname: mobile-lb.ulsfo.wikimedia.org
- mobile-https:
- description: MediaWiki based mobile site
- class: high-traffic1
- sites:
- - codfw
- - eqiad
- - esams
- - ulsfo
- ip: *ip_block004
- port: 443
- scheduler: sh
- bgp: 'no'
- depool-threshold: '.6'
- monitors:
- ProxyFetch:
- url:
- - https://en.m.wikipedia.org/wiki/Special:BlankPage
- IdleConnection:
- timeout-clean-reconnect: 3
- max-delay: 300
- conftool:
- cluster: cache_mobile
service: nginx
dns_rec_udp:
description: Recursive DNS - UDP
diff --git a/modules/role/manifests/cache/text.pp
b/modules/role/manifests/cache/text.pp
index 9e9cc17..5affb92 100644
--- a/modules/role/manifests/cache/text.pp
+++ b/modules/role/manifests/cache/text.pp
@@ -10,10 +10,7 @@
include role::cache::2layer
class { 'lvs::realserver':
- realserver_ips => merge(
- $lvs::configuration::service_ips['text'][$::site],
- $lvs::configuration::service_ips['mobile'][$::site]
- )
+ realserver_ips => $lvs::configuration::service_ips['text'][$::site]
}
$cluster_nodes = hiera('cache::text::nodes')
diff --git a/modules/role/manifests/lvs/balancer.pp
b/modules/role/manifests/lvs/balancer.pp
index b18849a..50621b5 100644
--- a/modules/role/manifests/lvs/balancer.pp
+++ b/modules/role/manifests/lvs/balancer.pp
@@ -14,7 +14,6 @@
# eqiad
/^(lvs10(0[14]|07|10))$/ => [
$sip['text'][$::site],
- $sip['mobile'][$::site],
],
/^(lvs10(0[25]|08|11))$/ => [
$sip['upload'][$::site],
@@ -47,7 +46,6 @@
# codfw (should mirror eqiad above, eventually, and become merged with
it via regex
/^(lvs200[14])$/ => [
$sip['text'][$::site],
- $sip['mobile'][$::site],
],
/^(lvs200[25])$/ => [
$sip['upload'][$::site],
@@ -67,7 +65,6 @@
# esams + ulsfo
/^(lvs[34]00[13])$/ => [
$sip['text'][$::site],
- $sip['mobile'][$::site],
],
/^(lvs300[24])$/ => [
$sip['upload'][$::site],
--
To view, visit https://gerrit.wikimedia.org/r/268226
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id6c195fcf32aac9f16f6901814b1049b72eacd82
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
