diff --git a/Modulefile b/Modulefile index 9b5ef161a8e2096ebf75bfac6727eb091e735bc6..815a9302337e473c5163fa583ec5ebb987921071 100644 --- a/Modulefile +++ b/Modulefile @@ -1,5 +1,5 @@ name 'nono-zfs' -version '0.0.1' +version '0.0.2' source 'git://forge-git.ircam.fr/puppet-module-base-zfs.git' author 'nono' license 'GPLv3' @@ -7,5 +7,4 @@ summary 'ZFS Puppet module' description 'This module installs ZFS from http://zfsonlinux.org/ on Linux hosts. It does not manage pools, just the kernel-level support.' project_page 'http://forge.ircam.fr/p/puppet-module-base-zfs/' -## Add dependencies, if any: -# dependency 'username/name', '>= 1.2.0' +dependency 'nono/dkms', '>= 0.0.1' diff --git a/manifests/init.pp b/manifests/init.pp index bd74444a9116ec646b370a0241b042b55528ee44..152fc03df7110004d4e21eca7d5fef8821e9d659 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -25,15 +25,9 @@ # class zfs { - if $::operatingsystem in ['RedHat', 'CentOS', 'Scientific'] { + include dkms - # We need kernel-headers for DKMS. - if !defined(Package['kernel-devel']) { - package { 'kernel-devel': - ensure => present, - before => Package['zfs'], - } - } + if $::operatingsystem in ['RedHat', 'CentOS', 'Scientific'] { package { 'zfs-release': ensure => present,