diff --git a/NEWS b/NEWS index 26e0b620a2ea9d63ad005c2b227d061577a2189a..8e9615e6824789cc7d10d2f9f7279599c65ca7bf 100644 --- a/NEWS +++ b/NEWS @@ -1,13 +1,14 @@ -UNRELEASED (2015-03-??) +release/004.034 (2015-04-08) - [yumtools] minor fix for RHEL5 and yum plugins (jlent) - -UNRELEASED (2015-03-??) + [yumtools] Minor fix for RHEL5 and yum plugins. (jlent) [cron] Add parameter to base::cron to allow anacron package to be installed (helpful for Ubuntu systems with ubuntu-desktop package). (adamhl) + [ipmi] Don't attempt to run ipmievd on jessie. It doesn't appear + to be available. (whm) + release/004.033 (2015-03-13) Modify the base::ssh::config::sshd define to allow the diff --git a/manifests/ipmi.pp b/manifests/ipmi.pp index d2e656266b910932312f67cda3eaf194ec16d8fd..5d20752271eca98f9e731475a3a574c15e598a4f 100644 --- a/manifests/ipmi.pp +++ b/manifests/ipmi.pp @@ -44,19 +44,22 @@ class base::ipmi { ensure => present, require => Base::Os::Kernel_module['ipmi_si']; } - service { 'ipmievd': - ensure => running, - name => 'ipmievd', - enable => true, - hasstatus => false, - status => 'pidof ipmievd', - require => [Base::Os::Kernel_module['ipmi_devintf'], - File['/etc/default/ipmievd'] - ], - } - file { '/etc/default/ipmievd': - source => 'puppet:///modules/base/ipmi/etc/default/ipmievd', - notify => Service['ipmievd'], + # ipmievd not available on jessie + if $::lsbdistcodename != 'jessie' { + service { 'ipmievd': + ensure => running, + name => 'ipmievd', + enable => true, + hasstatus => false, + status => 'pidof ipmievd', + require => [Base::Os::Kernel_module['ipmi_devintf'], + File['/etc/default/ipmievd'] + ], + } + file { '/etc/default/ipmievd': + source => 'puppet:///modules/base/ipmi/etc/default/ipmievd', + notify => Service['ipmievd'], + } } } 'RedHat': {