Ema has submitted this change and it was merged.

Change subject: Revert "cache_misc: downgrade almost all to varnish3"
......................................................................


Revert "cache_misc: downgrade almost all to varnish3"

This reverts commit 8622176856ff0c859f860bb2803261c968c71bc0.

We identified varnish commit 8b7cb51b76ad616143040ee955f1f6d9306251b9 as
the cause of T134989 and provided an updated package (4.1.2-1wm5).

Let's upgrade cache_misc to varnish4 again.

Bug: T134989
Bug: T131501
Change-Id: I34d5f4f4d50b5c9363060682e31911736bc03141
Ref: https://gerrit.wikimedia.org/r/#/c/288817/
Ref: 
https://github.com/varnishcache/varnish-cache/commit/8b7cb51b76ad616143040ee955f1f6d9306251b9
---
D hieradata/hosts/cp1045.yaml
D hieradata/hosts/cp3007.yaml
M hieradata/role/common/cache/misc.yaml
3 files changed, 1 insertion(+), 2 deletions(-)

Approvals:
  Ema: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/hieradata/hosts/cp1045.yaml b/hieradata/hosts/cp1045.yaml
deleted file mode 100644
index 75fb3e7..0000000
--- a/hieradata/hosts/cp1045.yaml
+++ /dev/null
@@ -1 +0,0 @@
-varnish_version4: true
diff --git a/hieradata/hosts/cp3007.yaml b/hieradata/hosts/cp3007.yaml
deleted file mode 100644
index 75fb3e7..0000000
--- a/hieradata/hosts/cp3007.yaml
+++ /dev/null
@@ -1 +0,0 @@
-varnish_version4: true
diff --git a/hieradata/role/common/cache/misc.yaml 
b/hieradata/role/common/cache/misc.yaml
index 731542e..48ca1af 100644
--- a/hieradata/role/common/cache/misc.yaml
+++ b/hieradata/role/common/cache/misc.yaml
@@ -23,3 +23,4 @@
   codfw: 'eqiad'
   ulsfo: 'codfw'
   esams: 'eqiad'
+varnish_version4: true

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I34d5f4f4d50b5c9363060682e31911736bc03141
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema <e...@wikimedia.org>
Gerrit-Reviewer: Ema <e...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to