Merge "Remove puppet pinning logic"

modules/openstack_project/files/centos7-puppetlabs.repo

@@ -4,4 +4,3 @@ baseurl=http://yum.puppetlabs.com/el/7/products/$basearch
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-puppetlabs
 enabled=1
 gpgcheck=1
-exclude=puppet-4* facter-3* puppetdb-3* puppetdb-terminus-3*

modules/openstack_project/manifests/template.pp

@@ -189,26 +189,6 @@ class openstack_project::template (
     line  => '    UseRoaming no',
   }
 
-  ###########################################################
-  # Manage Puppet
-  # possible TODO: break this into openstack_project::puppet
-
-  case $pin_puppet {
-    '2.7.': {
-      $pin_facter = '1.'
-      $pin_puppetdb = '1.'
-    }
-    /^3\./: {
-      $pin_facter = '2.'
-      $pin_puppetdb = '2.'
-    }
-    default: {
-      fail("Puppet version not supported")
-    }
-  }
-
-  # Which Puppet do I take?
-  # Take $puppet_version and pin to that version
   if ($::osfamily == 'Debian') {
     # NOTE(pabelanger): Puppetlabs only support Ubuntu Trusty and below,
     # anything greater will use the OS version of puppet.
@@ -248,15 +228,6 @@ class openstack_project::template (
       replace => true,
     }
 
-    file { '/etc/apt/preferences.d/00-puppet.pref':
-      ensure  => present,
-      owner   => 'root',
-      group   => 'root',
-      mode    => '0444',
-      content => template('openstack_project/00-puppet.pref.erb'),
-      replace => true,
-    }
-
     file { '/etc/default/puppet':
       ensure  => present,
       owner   => 'root',
@@ -278,9 +249,6 @@ class openstack_project::template (
       replace => true,
     }
   }
-
-  $puppet_version = $pin_puppet
-
   service { 'puppet':
     ensure => stopped,
     enable => false,

modules/openstack_project/templates/00-puppet.pref.erb

@@ -1,11 +0,0 @@
-Package: puppet puppet-common puppetmaster puppetmaster-common puppetmaster-passenger
-Pin: version <%= @pin_puppet %>*
-Pin-Priority: 501
-
-Package: puppetdb puppetdb-terminus
-Pin: version <%= @pin_puppetdb %>*
-Pin-Priority: 501
-
-Package: facter
-Pin: version <%= @pin_facter %>*
-Pin-Priority: 501