Permalink
Browse files

drbd::base - use kmod::load instead of kmod::install.

  • Loading branch information...
1 parent bc3e194 commit 993cbf158601819297a4f574605c8776892b4b1c @mfournier mfournier committed Oct 31, 2012
Showing with 13 additions and 5 deletions.
  1. +13 −5 manifests/base.pp
View
@@ -58,7 +58,7 @@
ensure => present,
alias => "drbd-module",
require => [ Yumrepo["atrpms-drbd"], File["/etc/yum.repos.d/atrpms-drbd.repo"] ],
- before => Kmod::Install['drbd'],
+ before => Kmod::Load['drbd'],
}
# Should probably be created by the drbd package, but is not.
@@ -107,7 +107,7 @@
ensure => present,
alias => "drbd-module",
require => Yumrepo["centos-extra-drbd"],
- before => Kmod::Install['drbd'],
+ before => Kmod::Load['drbd'],
}
}
@@ -138,19 +138,27 @@
package { "drbd8-source":
ensure => present,
alias => "drbd-module",
- before => Kmod::Install['drbd'],
+ before => Kmod::Load['drbd'],
}
}
}
- kmod::install {'drbd': }
+ kmod::load {'drbd': }
+
+ augeas { 'remove legacy modprobe.conf install entry':
+ incl => '/etc/modprobe.d/modprobe.conf',
+ lens => 'Modprobe.lns',
+ changes => "rm install[. = 'drbd']",
+ onlyif => "match install[. = 'drbd'] size > 0",
+ before => Kmod::Load['drbd'],
+ }
service { "drbd":
ensure => running,
hasstatus => true,
restart => "/etc/init.d/drbd reload",
enable => true,
- require => [Package["drbd"], Kmod::Install['drbd']],
+ require => [Package["drbd"], Kmod::Load['drbd']],
}
# this file just includes other files

0 comments on commit 993cbf1

Please sign in to comment.