Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102159
Change subject: Rename LVS service 'text-varnish' to 'text'
......................................................................
Rename LVS service 'text-varnish' to 'text'
Change-Id: I8920f13e2cd76a472552ac8ce152d9ab15224165
---
M manifests/lvs.pp
M manifests/role/cache.pp
M manifests/site.pp
3 files changed, 25 insertions(+), 29 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/59/102159/1
diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index cbc8420..a529fac 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -112,7 +112,7 @@
# NOTE! This hash is referenced in many other manifests
$lvs_service_ips = {
'production' => {
- 'text-varnish' => {
+ 'text' => {
'pmtpa' => {},
'eqiad' => {
'textsvc' => "10.2.2.25",
@@ -312,9 +312,6 @@
'text' => {
'pmtpa' => "10.4.0.4",
},
- 'text-varnish' => {
- 'pmtpa' => [],
- },
'apaches' => {
'pmtpa' => "10.4.0.254",
},
@@ -364,11 +361,11 @@
$service_ips = $lvs_service_ips[$::realm]
$lvs_services = {
- 'text-varnish' => {
+ 'text' => {
'description' => "Main wiki platform LVS service,
text.${::site}.wikimedia.org (Varnish)",
'class' => 'high-traffic1',
'sites' => [ 'eqiad', 'esams', 'ulsfo' ],
- 'ip' => $service_ips['text-varnish'][$::site],
+ 'ip' => $service_ips['text'][$::site],
'bgp' => 'yes',
'depool-threshold' => '.5',
'monitors' => {
@@ -382,7 +379,7 @@
'description' => "Main wiki platform LVS service,
text.${::site}.wikimedia.org (nginx)",
'class' => 'high-traffic1',
'sites' => [ 'ulsfo' ],
- 'ip' => $service_ips['text-varnish'][$::site],
+ 'ip' => $service_ips['text'][$::site],
'port' => 443,
'bgp' => 'no',
'depool-threshold' => '.5',
@@ -1011,41 +1008,41 @@
# EQIAD
monitor_service_lvs_http_https {
"wikimedia-lb.eqiad.wikimedia.org":
- ip_address =>
$ip['text-varnish']['eqiad']['wikimedialb'],
+ ip_address => $ip['text']['eqiad']['wikimedialb'],
uri => "meta.wikimedia.org!/wiki/Main_Page";
"wikipedia-lb.eqiad.wikimedia.org":
- ip_address =>
$ip['text-varnish']['eqiad']['wikipedialb'],
+ ip_address => $ip['text']['eqiad']['wikipedialb'],
uri => "en.wikipedia.org!/wiki/Main_Page";
"wiktionary-lb.eqiad.wikimedia.org":
- ip_address =>
$ip['text-varnish']['eqiad']['wiktionarylb'],
+ ip_address => $ip['text']['eqiad']['wiktionarylb'],
uri => "en.wikipedia.org!/wiki/Main_Page",
critical => "false";
"wikiquote-lb.eqiad.wikimedia.org":
- ip_address =>
$ip['text-varnish']['eqiad']['wikiquotelb'],
+ ip_address => $ip['text']['eqiad']['wikiquotelb'],
uri => "en.wikipedia.org!/wiki/Main_Page",
critical => "false";
"wikibooks-lb.eqiad.wikimedia.org":
- ip_address =>
$ip['text-varnish']['eqiad']['wikibookslb'],
+ ip_address => $ip['text']['eqiad']['wikibookslb'],
uri => "en.wikipedia.org!/wiki/Main_Page",
critical => "false";
"wikisource-lb.eqiad.wikimedia.org":
- ip_address =>
$ip['text-varnish']['eqiad']['wikisourcelb'],
+ ip_address => $ip['text']['eqiad']['wikisourcelb'],
uri => "en.wikipedia.org!/wiki/Main_Page",
critical => "false";
"wikinews-lb.eqiad.wikimedia.org":
- ip_address =>
$ip['text-varnish']['eqiad']['wikinewslb'],
+ ip_address => $ip['text']['eqiad']['wikinewslb'],
uri => "en.wikipedia.org!/wiki/Main_Page",
critical => "false";
"wikiversity-lb.eqiad.wikimedia.org":
- ip_address =>
$ip['text-varnish']['eqiad']['wikiversitylb'],
+ ip_address => $ip['text']['eqiad']['wikiversitylb'],
uri => "en.wikipedia.org!/wiki/Main_Page",
critical => "false";
"mediawiki-lb.eqiad.wikimedia.org":
- ip_address =>
$ip['text-varnish']['eqiad']['mediawikilb'],
+ ip_address => $ip['text']['eqiad']['mediawikilb'],
uri => "en.wikipedia.org!/wiki/Main_Page",
critical => "false";
"foundation-lb.eqiad.wikimedia.org":
- ip_address =>
$ip['text-varnish']['eqiad']['foundationlb'],
+ ip_address => $ip['text']['eqiad']['foundationlb'],
uri => "en.wikipedia.org!/wiki/Main_Page",
critical => "false";
"bits-lb.eqiad.wikimedia.org":
@@ -1058,10 +1055,10 @@
ip_address => $ip['mobile']['eqiad']['mobilelb'],
uri => "en.m.wikipedia.org!/wiki/Main_Page";
"wikidata-lb.eqiad.wikimedia.org":
- ip_address =>
$ip['text-varnish']['eqiad']['wikidatalb'],
+ ip_address => $ip['text']['eqiad']['wikidatalb'],
uri => "www.wikidata.org!/";
"wikivoyage-lb.eqiad.wikimedia.org":
- ip_address =>
$ip['text-varnish']['eqiad']['wikivoyagelb'],
+ ip_address => $ip['text']['eqiad']['wikivoyagelb'],
uri => "en.wikivoyage.org!/wiki/Main_Page";
'misc-web-lb.eqiad.wikimedia.org':
ip_address => $ip['misc_web']['eqiad']['misc_web'],
@@ -1139,7 +1136,7 @@
monitor_service_lvs_http_https {
"text-lb.esams.wikimedia.org":
- ip_address => $ip['text-varnish']['esams']['textlb'],
+ ip_address => $ip['text']['esams']['textlb'],
uri => "en.wikipedia.org!/wiki/Main_Page";
"bits-lb.esams.wikimedia.org":
ip_address => $ip['bits']['esams']['bitslb'],
@@ -1154,7 +1151,7 @@
monitor_service_lvs6_http_https {
"text-lb.esams.wikimedia.org":
- ip_address => $ip['text-varnish']['esams']['textlb6'],
+ ip_address => $ip['text']['esams']['textlb6'],
uri => "en.wikipedia.org!/wiki/Main_Page";
"bits-lb.esams.wikimedia.org":
ip_address => $ip['bits']['esams']['bitslb6'],
@@ -1171,7 +1168,7 @@
monitor_service_lvs_http_https {
"text-lb.ulsfo.wikimedia.org":
- ip_address => $ip['text-varnish']['ulsfo']['textlb'],
+ ip_address => $ip['text']['ulsfo']['textlb'],
uri => "en.wikipedia.org!/wiki/Main_Page";
"bits-lb.ulsfo.wikimedia.org":
ip_address => $ip['bits']['ulsfo']['bitslb'],
@@ -1186,7 +1183,7 @@
monitor_service_lvs6_http_https {
"text-lb.ulsfo.wikimedia.org":
- ip_address => $ip['text-varnish']['ulsfo']['textlb6'],
+ ip_address => $ip['text']['ulsfo']['textlb6'],
uri => "en.wikipedia.org!/wiki/Main_Page";
"bits-lb.ulsfo.wikimedia.org":
ip_address => $ip['bits']['ulsfo']['bitslb6'],
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index afedea3..eb929a5 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -827,8 +827,7 @@
# FIXME: remove this hack
include lvs::configuration
class { 'lvs::realserver':
- realserver_ips =>
flatten([$lvs::configuration::lvs_service_ips[$::realm]['text'][$::site],
-
$lvs::configuration::lvs_service_ips[$::realm]['text-varnish'][$::site]])
+ realserver_ips =>
$lvs::configuration::lvs_service_ips[$::realm]['text'][$::site],
}
include role::cache::varnish::text
diff --git a/manifests/site.pp b/manifests/site.pp
index d456bd4..d769310 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -78,7 +78,7 @@
$lvs_balancer_ips = $::hostname ? {
/^amslvs[13]$/ => [
- $sip['text-varnish'][$::site],
+ $sip['text'][$::site],
$sip['bits'][$::site],
$sip['mobile'][$::site],
$sip['ipv6'][$::site],
@@ -1454,7 +1454,7 @@
$sip['misc_web'][$::site],
],
/^lvs[26]$/ => [
- $sip['text-varnish'][$::site],
+ $sip['text'][$::site],
$sip['bits'][$::site],
$sip['ipv6'][$::site],
],
@@ -1520,7 +1520,7 @@
$lvs_balancer_ips = $::hostname? {
/^lvs100[14]$/ => [
- $sip['text-varnish'][$::site],
+ $sip['text'][$::site],
$sip['bits'][$::site],
$sip['mobile'][$::site],
$sip['ipv6'][$::site],
@@ -1699,7 +1699,7 @@
$lvs_balancer_ips = $::hostname ? {
/^lvs400[13]$/ => [
- $sip['text-varnish'][$::site],
+ $sip['text'][$::site],
$sip['bits'][$::site],
$sip['mobile'][$::site],
],
--
To view, visit https://gerrit.wikimedia.org/r/102159
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8920f13e2cd76a472552ac8ce152d9ab15224165
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
