Alexandros Kosiaris has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/347825 )

Change subject: puppetmaster: Remove the jessie-backports pinning
......................................................................

puppetmaster: Remove the jessie-backports pinning

jessie-backports currently has 4.8 puppet which we do not want to
install. Thankfully the install could not succeed due to a Requirement
of facter >= 2.4 which due to the way apt pref downprefed
jessie-backports for the facter package made the puppet packages from
jessie-backports non-installable. Remove the pin to jessie-backports
since that version would break our installation

Bug: T162462
Change-Id: I755d2200937664d30d99f114eda4248c7958b252
---
M modules/puppetmaster/manifests/init.pp
1 file changed, 0 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/25/347825/1

diff --git a/modules/puppetmaster/manifests/init.pp 
b/modules/puppetmaster/manifests/init.pp
index 9d343e5..3af6a89 100644
--- a/modules/puppetmaster/manifests/init.pp
+++ b/modules/puppetmaster/manifests/init.pp
@@ -70,23 +70,6 @@
         server_type => $server_type,
     }
 
-    # Let's use puppet 3.8 on the masters at least
-    if os_version('debian >= jessie') {
-        $pinned_pkgs = ['puppet', 'puppetmaster', 'puppetmaster-common',
-                        'vim-puppet', 'puppet-el', 'puppetmaster-passenger',
-                        'puppet-common']
-        apt::pin { 'puppet':
-            package  => join(sort($pinned_pkgs), ' '),
-            pin      => 'release a=jessie-backports',
-            priority => '1001',
-            before   => Package['puppetmaster-common'],
-        }
-
-        # Install the puppetdb-terminus package, needed for puppetdbquery
-        require_package('puppetdb-terminus')
-    }
-
-
     package { [
         'puppetmaster',
         'puppetmaster-common',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I755d2200937664d30d99f114eda4248c7958b252
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>

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

Reply via email to