Herron has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/389478 )

Change subject: puppet: conditionally pin packages to appropriate repo for 
puppet 4
......................................................................

puppet: conditionally pin packages to appropriate repo for puppet 4

When $puppet_major_version == 4 pin puppet* packages to the apt repository
containing puppet 4 packages for the OS release.

Depends on T178825 puppet version selection.

Depends-On: 388538
Bug: T179724
Change-Id: I3346daed950ccfb0467fb2446e1c08e33324181b
---
M modules/base/manifests/puppet.pp
1 file changed, 20 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/78/389478/1

diff --git a/modules/base/manifests/puppet.pp b/modules/base/manifests/puppet.pp
index 7936b31..85d3e4c 100644
--- a/modules/base/manifests/puppet.pp
+++ b/modules/base/manifests/puppet.pp
@@ -12,6 +12,26 @@
     $use_srv_record = $base::puppet::params::use_srv_record
     $ca_server = hiera('puppetmaster::ca_server', '')
 
+
+    # pin puppet* packages to appropriate repo on puppet 4 hosts
+    if $puppet_major_version == 4 {
+        $puppet_pkg_pin_repo = $facts['lsbdistcodename'] ? {
+            'jessie'  => 'jessie-backports',
+            'stretch' => 'stretch',
+            default   => undef,
+        }
+
+        if $puppet_pkg_pin_repo {
+            apt::pin { 'puppet*':
+                pin      => "release a=${puppet_pkg_pin_repo}",
+                priority => '1001',
+            }
+        } else {
+            notify { 'Warning: Puppet 4 package configuration not yet 
available for this OS release. Unset $puppet_major_version to clear this 
warning': }
+        }
+
+    }
+
     package { [ 'puppet', 'facter' ]:
         ensure => present,
     }

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

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

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

Reply via email to