Mark Bergsma has submitted this change and it was merged.

Change subject: Fix ulsfo upload LVS services
......................................................................


Fix ulsfo upload LVS services

Change-Id: I89aa9577e7fe039ab5f008e6009dc43421f22501
---
M manifests/lvs.pp
1 file changed, 13 insertions(+), 1 deletion(-)

Approvals:
  Mark Bergsma: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index eae9387..f5fb62b 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -340,7 +340,7 @@
                                'pmtpa' => { 'uploadlb' => "208.80.152.211", 
'uploadsvc' => "10.2.1.24" },
                                'eqiad' => { 'uploadlb' => "208.80.154.235", 
'uploadlb6' => "2620:0:861:ed1a::b", 'uploadsvc' => "10.2.2.24" },
                                'esams' => { 'uploadlb' => "91.198.174.234", 
'uploadsvc' => "10.2.3.24" },
-                               'ulsfo' => { 'uploadlb' => "198.35.26.107",  
'bitslb6'   => "2620:0:863:ed1a::b", 'bitssvc' => "10.2.4.24" },
+                               'ulsfo' => { 'uploadlb' => "198.35.26.107",  
'uploadlb6' => "2620:0:863:ed1a::b", 'uploadsvc' => "10.2.4.24" },
                        },
                        'payments' => {
                                'pmtpa' => "208.80.152.213",
@@ -582,6 +582,18 @@
                                'IdleConnection' => 
$idleconnection_monitor_options
                        },
                },
+               "upload-https" => {
+                       'description' => "Images and other media, 
upload.${::site}.wikimedia.org",
+                       'class' => "high-traffic2",
+                       'sites' => [ "ulsfo" ],
+                       'ip' => $service_ips['upload'][$::site],
+                       'port' => 443,
+                       'bgp' => "no",
+                       'depool-threshold' => ".5",
+                       'monitors' => {
+                               'IdleConnection' => 
$idleconnection_monitor_options
+                       },
+               },
                "mobile" => {
                        'description' => "MediaWiki based mobile site",
                        'class' => 'high-traffic1',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I89aa9577e7fe039ab5f008e6009dc43421f22501
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <[email protected]>
Gerrit-Reviewer: Mark Bergsma <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to