From 32711a3a284bfa1726baeb7d3c0b6c58d343303c Mon Sep 17 00:00:00 2001
From: Arnaud Gomes <Arnaud.Gomes@ircam.fr>
Date: Tue, 9 Apr 2013 15:22:55 +0200
Subject: [PATCH] DKMS is handled by a separate module.
---
Modulefile | 5 ++---
manifests/init.pp | 10 ++--------
2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/Modulefile b/Modulefile
index 9b5ef16..815a930 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 bd74444..152fc03 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,
--
GitLab