Ema has uploaded a new change for review.

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

Change subject: Remove varnish::apt_preferences
......................................................................

Remove varnish::apt_preferences

There is no need for APT pinning of Varnish packages now that all hosts
are running v4.

Bug: T150660
Change-Id: I29a80155e5ea8b6b9fb8204486ee862fca63fdc4
---
D modules/varnish/manifests/apt_preferences.pp
M modules/varnish/manifests/packages.pp
2 files changed, 1 insertion(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/03/322703/1

diff --git a/modules/varnish/manifests/apt_preferences.pp 
b/modules/varnish/manifests/apt_preferences.pp
deleted file mode 100644
index df8eb78..0000000
--- a/modules/varnish/manifests/apt_preferences.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-class varnish::apt_preferences {
-    # XXX: to remove
-    apt::pin { 'varnish':
-        ensure   => 'absent',
-        pin      => '',
-        priority => '',
-    }
-}
diff --git a/modules/varnish/manifests/packages.pp 
b/modules/varnish/manifests/packages.pp
index 9f78765..3701b54 100644
--- a/modules/varnish/manifests/packages.pp
+++ b/modules/varnish/manifests/packages.pp
@@ -1,13 +1,10 @@
 class varnish::packages($version='installed') {
-    require varnish::apt_preferences
-
     package { [
         'varnish',
         'varnish-dbg',
         'libvarnishapi1',
         ]:
         ensure  => $version,
-        require => Class['varnish::apt_preferences'],
     }
 
     # Install VMODs on Varnish 4 instances
@@ -21,6 +18,6 @@
         'libvmod-vslp',
         ]:
         ensure  => 'installed',
-        require => [ Class['varnish::apt_preferences'], 
Package['libvmod-header'] ],
+        require => Package['libvmod-header'],
     }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I29a80155e5ea8b6b9fb8204486ee862fca63fdc4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema <e...@wikimedia.org>

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

Reply via email to