Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164552
Change subject: lvs: add swift in codfw
......................................................................
lvs: add swift in codfw
plus icinga monitoring and deprecate pmtpa
Change-Id: I4d9729d20efd97fb192783fe9f3cb245bff02cc5
---
M modules/lvs/manifests/configuration.pp
M modules/lvs/manifests/monitor.pp
2 files changed, 8 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/52/164552/1
diff --git a/modules/lvs/manifests/configuration.pp
b/modules/lvs/manifests/configuration.pp
index f37faf8..f3b8d20 100644
--- a/modules/lvs/manifests/configuration.pp
+++ b/modules/lvs/manifests/configuration.pp
@@ -208,6 +208,7 @@
},
'swift' => {
'eqiad' => "10.2.2.27",
+ 'codfw' => "10.2.1.27",
},
'dns_rec' => {
'eqiad' => { 'dns_rec' => "208.80.154.239", 'dns_rec6' =>
"2620:0:861:ed1a::f" },
@@ -285,7 +286,6 @@
# ms emulator set in July 2013. Beta does not have Swift yet.
# instance is an unpuppetized hack with nginx proxy.
'eqiad' => '10.68.16.189', # deployment-upload.eqiad.wmflabs
- 'pmtpa' => '10.4.1.103', # deployment-upload.pmtpa.wmflabs
},
'upload' => {
'pmtpa' => {
@@ -782,7 +782,7 @@
"swift" => {
'description' => "Swift/Ceph media storage",
'class' => "low-traffic",
- 'sites' => [ "pmtpa", "eqiad" ],
+ 'sites' => [ "codfw", "eqiad" ],
'ip' => $service_ips['swift'][$::site],
'bgp' => "yes",
'depool-threshold' => ".5",
diff --git a/modules/lvs/manifests/monitor.pp b/modules/lvs/manifests/monitor.pp
index 2471d13..6a7fc5d 100644
--- a/modules/lvs/manifests/monitor.pp
+++ b/modules/lvs/manifests/monitor.pp
@@ -5,7 +5,7 @@
$ip = $lvs::configuration::lvs_service_ips['production']
- # INTERNAL
+ # INTERNAL EQIAD
lvs::monitor_service_http { "appservers.svc.eqiad.wmnet": ip_address =>
"10.2.2.1", check_command => "check_http_lvs!en.wikipedia.org!/wiki/Main_Page" }
lvs::monitor_service_http { "hhvm-appservers.svc.eqiad.wmnet": ip_address
=> "10.2.2.2", check_command =>
"check_http_lvs!en.wikipedia.org!/wiki/Main_Page" }
@@ -24,6 +24,11 @@
lvs::monitor_service_custom { "search-pool5.svc.eqiad.wmnet": ip_address
=> "10.2.2.16", port => 8123, description => "LVS Lucene", check_command =>
"check_lucene" }
lvs::monitor_service_custom { "search-prefix.svc.eqiad.wmnet": ip_address
=> "10.2.2.15", port => 8123, description => "LVS Lucene", check_command =>
"check_lucene" }
+ # INTERNAL CODFW
+
+ lvs::monitor_service_http { "ms-fe.svc.codfw.wmnet": ip_address =>
"10.2.1.27", check_command =>
"check_http_lvs!ms-fe.svc.codfw.wmnet!/monitoring/backend" }
+
+
# EQIAD
lvs::monitor_service_http_https {
'text-lb.eqiad.wikimedia.org':
--
To view, visit https://gerrit.wikimedia.org/r/164552
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4d9729d20efd97fb192783fe9f3cb245bff02cc5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
