Commit d9cfa037 authored by Jonathan Lent's avatar Jonathan Lent
Browse files

See NEWS; edits to facilitate Puppet 3 RHEL upgrades

parent a74eb181
release/??????? (2015-02-25)
release/??????? (2015-02-27)
Beginning of work to support RHEL-ish operating systems
such as CentOS and Oracle Linux. The most common change
......@@ -7,6 +7,10 @@ release/??????? (2015-02-25)
potentially affect any existing hosts. There may be some
additional refinements when CentOS and Oracle hosts come
online; for now, we're assuming they act identical to RHEL.
Additionally modified puppetclient.pp to support version
locking of puppet and facter versions on RHEL systems.
Added one additional manifest to facilitate this.
(jlent)
release/004.030 (2015-02-25)
......
# install and configure the puppet client
class base::puppetclient {
file { '/etc/puppet':
ensure => directory,
......@@ -7,9 +8,19 @@ class base::puppetclient {
ensure => present,
}
package { 'puppet':
ensure => present,
require => Base::Puppetclient::Config['/etc/puppet/puppet.conf'],
# pin puppet and facter versions on RHELish systems
if ($::osfamily == 'RedHat') {
include base::yumtools::yum_puppet_lock
package { 'puppet':
ensure => present,
require => [ Base::Puppetclient::Config['/etc/puppet/puppet.conf'],
Class['base::yumtools::yum_puppet_lock'] ],
}
} else { # Debianish systems; pinning handled at repository level
package { 'puppet':
ensure => present,
require => Base::Puppetclient::Config['/etc/puppet/puppet.conf'],
}
}
# It appears that on recently updated wheezy servers, 2.x clients need
......
# Parameterized class to lock puppet and facter versions
# on RHEL-ish hosts using yum versionlock
# facter_version: the yum-aware version of facter to lock
# puppet_version: the yum-aware version of puppet to lock
class base::yumtools::yum_puppet_lock (
$facter_version = '2.2.0-1',
$puppet_version = '3.7.2-1'
) {
base::yumtools::versionlock {
"0:puppet-${puppet_version}.el${::lsbmajdistrelease}*":
ensure => present,
}
base::yumtools::versionlock {
"1:facter-${facter_version}.el${::lsbmajdistrelease}*":
ensure => present,
}
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment