Skip to content
Snippets Groups Projects
Commit 6cb04243 authored by Jonathan Lent's avatar Jonathan Lent
Browse files

see NEWS for release info

parent a202e58a
No related branches found
No related tags found
No related merge requests found
release/004.028 (2015-02-24d)
[rpm][yumtools] - slight reorganization involving which
manifest actually installs the yum versionlock package (jlent)
release/004.028 (2015-02-24c) release/004.028 (2015-02-24c)
[puppetclient] Undo the basemodulepath configuration directive [puppetclient] Undo the basemodulepath configuration directive
......
...@@ -26,19 +26,8 @@ class base::rpm { ...@@ -26,19 +26,8 @@ class base::rpm {
case $::osfamily { case $::osfamily {
'RedHat': { 'RedHat': {
$redhatPackages = $libmajdistrelease ? { $redhatPackages = [ 'yum', 'yum-utils' ]
'5' => [ 'yum', 'yum-utils', 'yum-versionlock' ],
default => [ 'yum', 'yum-utils', 'yum-plugin-versionlock' ],
}
package { $redhatPackages: ensure => present } package { $redhatPackages: ensure => present }
# pushing out with amended name, since one-off manual package pins
# would be overwritten by standard delivery of this file
file { '/etc/yum/pluginconf.d/versionlock.list.puppet':
ensure => present,
source => 'puppet:///modules/base/rpm/etc/yum/pluginconf.d/versionlock.list',
require => Package[ $redhatPackages ],
}
file { '/etc/yum.repos.d': file { '/etc/yum.repos.d':
ensure => directory, ensure => directory,
......
...@@ -17,9 +17,14 @@ ...@@ -17,9 +17,14 @@
# #
define base::yumtools::plugin ( define base::yumtools::plugin (
$ensure = present, $ensure = present,
$pkg_prefix = 'yum-plugin', #$pkg_prefix = 'yum-plugin',
$pkg_name = '' $pkg_name = ''
) { ) {
$pkg_prefix = $libmajdistrelease ? {
'5' => 'yum',
default => 'yum-plugin',
}
$_pkg_name = $pkg_name ? { $_pkg_name = $pkg_name ? {
'' => "${pkg_prefix}-${name}", '' => "${pkg_prefix}-${name}",
default => "${pkg_prefix}-${pkg_name}" default => "${pkg_prefix}-${pkg_name}"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment