[MediaWiki-commits] [Gerrit] restbase: add LVS configuration - change (operations/puppet)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/190786

Change subject: restbase: add LVS configuration
......................................................................

restbase: add LVS configuration

note: as a followup to this we'll need a role or variable not to deploy LVS
realserver during testing

Bug: T89636
Change-Id: I85d70c5b2aded256ab808789e9ec0e6b8ca3bd8b
---
M manifests/role/lvs.pp
M manifests/role/restbase.pp
M modules/lvs/manifests/configuration.pp
M modules/lvs/manifests/monitor.pp
4 files changed, 24 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/86/190786/1

diff --git a/manifests/role/lvs.pp b/manifests/role/lvs.pp
index 7692336..9123a1b 100644
--- a/manifests/role/lvs.pp
+++ b/manifests/role/lvs.pp
@@ -44,6 +44,7 @@
             $sip['citoid'][$::site],
             $sip['cxserver'][$::site],
             $sip['search'][$::site],
+            $sip['restbase'][$::site],
             ],
 
         # codfw (should mirror eqiad above, eventually, and become merged with 
it via regex
diff --git a/manifests/role/restbase.pp b/manifests/role/restbase.pp
index e003194..dd302a5 100644
--- a/manifests/role/restbase.pp
+++ b/manifests/role/restbase.pp
@@ -1,9 +1,14 @@
 # == Class role::restbase
 #
 
+@monitoring::group { 'restbase_eqiad': description => 'Restbase eqiad' }
+
 # Config should be pulled from hiera
 class role::restbase {
     system::role { 'restbase': description => "Restbase ${::realm}" }
 
     include ::restbase
+
+    include lvs::configuration
+    class { 'lvs::realserver': realserver_ips => 
$lvs::configuration::lvs_service_ips[$::realm]['restbase'][$::site] }
 }
diff --git a/modules/lvs/manifests/configuration.pp 
b/modules/lvs/manifests/configuration.pp
index 9ee3141..4c33669 100644
--- a/modules/lvs/manifests/configuration.pp
+++ b/modules/lvs/manifests/configuration.pp
@@ -173,6 +173,9 @@
             'cxserver' => {
                 'eqiad' => "10.2.2.18",
             },
+            'restbase' => {
+                'eqiad' => "10.2.2.32",
+            },
         },
         'labs' => {
             'text' => {
@@ -204,6 +207,7 @@
             'parsoidcache' => {},
             'search' => {},
             'stream' => {},
+            'restbase' => {},
         }
     }
 
@@ -697,5 +701,18 @@
                 'IdleConnection' => $idleconnection_monitor_options,
             }
         }
+        'restbase' => {
+            'description' => 'RESTBase, cxserver.svc.eqiad.wmnet',
+            'class' => 'high-traffic2',
+            'sites' => [ 'eqiad' ],
+            'ip' => $service_ips['restbase'][$::site],
+            'port' => 7231,
+            'bgp' => 'yes',
+            'depool-threshold' => '.5',
+            'monitors' => {
+                'ProxyFetch' => { 'url' => [ 'http://restbase.svc.eqiad.wmnet' 
] },
+                'IdleConnection' => $idleconnection_monitor_options,
+            }
+        }
     }
 }
diff --git a/modules/lvs/manifests/monitor.pp b/modules/lvs/manifests/monitor.pp
index 487fff0..cd5493d 100644
--- a/modules/lvs/manifests/monitor.pp
+++ b/modules/lvs/manifests/monitor.pp
@@ -17,6 +17,7 @@
     lvs::monitor_service_http { 'mathoid.svc.eqiad.wmnet': ip_address => 
$ip['mathoid']['eqiad'], check_command => 
"check_http_lvs_on_port!mathoid.svc.eqiad.wmnet!10042!/" }
     lvs::monitor_service_http { 'citoid.svc.eqiad.wmnet': ip_address => 
$ip['citoid']['eqiad'], check_command => 
"check_http_lvs_on_port!citoid.svc.eqiad.wmnet!1970!/", contact_group => 
"admins,parsoid" }
     lvs::monitor_service_http { 'cxserver.svc.eqiad.wmnet': ip_address => 
$ip['cxserver']['eqiad'], check_command => 
"check_http_lvs_on_port!citoid.svc.eqiad.wmnet!8080!/" }
+    lvs::monitor_service_http { 'restbase.svc.eqiad.wmnet': ip_address => 
$ip['restbase']['eqiad'], check_command => 
"check_http_lvs_on_port!restbase.svc.eqiad.wmnet!7231!/" }
 
     # INTERNAL CODFW
 

-- 
To view, visit https://gerrit.wikimedia.org/r/190786
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I85d70c5b2aded256ab808789e9ec0e6b8ca3bd8b
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