tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed some depency errors from nfs module and cleaned up some lint errors.

Browse source
This commit is contained in:
Timo Mkinen 2012-07-26 14:01:59 +03:00
parent 898d80e2dc
commit 6d564bd25d
1 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
nfs/manifests/init.pp
View file

@ -3,7 +3,7 @@
# #
class nfs::client { class nfs::client {
include portmap::server require portmap::server
package { "nfs-utils": package { "nfs-utils":
ensure => installed, ensure => installed,
@ -18,15 +18,14 @@ class nfs::client {
} }
service { "nfslock": service { "nfslock":
name => $operatingsystem ? { name => $::operatingsystem ? {
"fedora" => "nfs-lock", "fedora" => "nfs-lock",
default => "nfslock", default => "nfslock",
}, },
ensure => running, ensure => running,
enable => true, enable => true,
hasstatus => true, hasstatus => true,
require => [ Package["nfs-utils"], require => Package["nfs-utils"],
Class["portmap::server"], ],
} }
} }
@ -34,17 +33,19 @@ class nfs::client {
# Install and configure NFS server. # Install and configure NFS server.
# #
class nfs::server inherits nfs::client { class nfs::server {
include portmap::server require nfs::client
file { "/etc/exports": file { "/etc/exports":
ensure => present, ensure => present,
source => [ "puppet:///files/nfs/exports.${fqdn}", source => [
"puppet:///modules/nfs/exports", ], "puppet:///files/nfs/exports.${::fqdn}",
"puppet:///modules/nfs/exports",
],
mode => "0644", mode => "0644",
owner => root, owner => "root",
group => root, group => "root",
require => Package["nfs-utils"], require => Package["nfs-utils"],
notify => Exec["exportfs"], notify => Exec["exportfs"],
} }
@ -60,16 +61,13 @@ class nfs::server inherits nfs::client {
service { "nfs": service { "nfs":
ensure => running, ensure => running,
name => $operatingsystem ? { name => $::operatingsystem ? {
"fedora" => "nfs-server", "fedora" => "nfs-server",
default => "nfs", default => "nfs",
}, },
enable => true, enable => true,
hasstatus => true, hasstatus => true,
require => [ require => Service["nfslock"],
Package["nfs-utils"],
Class["portmap::server"],
],
} }
exec { "exportfs": exec { "exportfs":