nfs: Merge from parameterize branch
This commit is contained in:
parent
f619236878
commit
bd5ccf4211
3 changed files with 100 additions and 28 deletions
|
@ -1,4 +1,3 @@
|
|||
|
||||
# Install NFS client.
|
||||
#
|
||||
class nfs::client {
|
||||
|
@ -13,12 +12,31 @@ class nfs::client {
|
|||
},
|
||||
}
|
||||
|
||||
if $::operatingsystem == "Fedora" and $::operatingsystemrelease >= 16 {
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=692008
|
||||
service { "NetworkManager-wait-online":
|
||||
ensure => stopped,
|
||||
enable => true,
|
||||
case $::operatingsystem {
|
||||
"fedora": {
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=692008
|
||||
service { "NetworkManager-wait-online":
|
||||
ensure => stopped,
|
||||
enable => true,
|
||||
}
|
||||
}
|
||||
"ubuntu": {
|
||||
file { "/etc/modprobe.d/lockd.conf":
|
||||
ensure => present,
|
||||
mode => "0644",
|
||||
owner => "root",
|
||||
group => "root",
|
||||
content => "options lockd nlm_tcpport=4001 nlm_udpport=4001\n",
|
||||
before => Package["nfs-utils"],
|
||||
}
|
||||
augeas { "set-nfs-common":
|
||||
context => "/files/etc/default/nfs-common",
|
||||
changes => "set STATDOPTS '\"--port 4000\"'",
|
||||
notify => Service["nfslock"],
|
||||
require => Package["nfs-utils"],
|
||||
}
|
||||
}
|
||||
default: { }
|
||||
}
|
||||
|
||||
service { "nfslock":
|
||||
|
@ -26,8 +44,8 @@ class nfs::client {
|
|||
enable => true,
|
||||
name => $::operatingsystem ? {
|
||||
"centos" => $::operatingsystemrelease ? {
|
||||
/^[1-6]/ => "nfslock",
|
||||
default => "rpc-statd",
|
||||
/^[1-6]/ => "nfslock",
|
||||
default => "rpc-statd",
|
||||
},
|
||||
"fedora" => $::operatingsystemrelease ? {
|
||||
/^([1-9]|1[0-5])$/ => "nfslock",
|
||||
|
@ -45,30 +63,62 @@ class nfs::client {
|
|||
|
||||
# Install and configure NFS server.
|
||||
#
|
||||
class nfs::server {
|
||||
# === Parameters
|
||||
#
|
||||
# $servers:
|
||||
# Number of nfs server processes to be started. Defaults to 8.
|
||||
#
|
||||
# $versions:
|
||||
# Array of NFS versions to enable. Defaults to [ "3" ].
|
||||
#
|
||||
class nfs::server(
|
||||
$servers="8",
|
||||
$versions=["3"],
|
||||
) {
|
||||
|
||||
$default_versions = [ "2", "3", "4" ]
|
||||
$disable_versions = inline_template('<%= (@default_versions - @versions).map { |v| "-N %s" % v }.join(" ") %>')
|
||||
|
||||
require nfs::client
|
||||
|
||||
file { "/etc/exports":
|
||||
ensure => present,
|
||||
source => [
|
||||
ensure => present,
|
||||
source => [
|
||||
"puppet:///files/nfs/exports.${::homename}",
|
||||
"puppet:///modules/nfs/exports",
|
||||
],
|
||||
mode => "0644",
|
||||
owner => "root",
|
||||
group => "root",
|
||||
require => Package["nfs-utils"],
|
||||
notify => Exec["exportfs"],
|
||||
mode => "0644",
|
||||
owner => "root",
|
||||
group => "root",
|
||||
notify => Exec["exportfs"],
|
||||
}
|
||||
|
||||
file { "/etc/sysconfig/nfs":
|
||||
ensure => present,
|
||||
content => template("nfs/nfs.sysconfig.erb"),
|
||||
mode => "0644",
|
||||
owner => "root",
|
||||
group => "root",
|
||||
notify => Service["nfs"],
|
||||
case $::operatingsystem {
|
||||
"centos","redhat","fedora": {
|
||||
file { "/etc/sysconfig/nfs":
|
||||
ensure => present,
|
||||
mode => "0644",
|
||||
owner => "root",
|
||||
group => "root",
|
||||
content => template("nfs/nfs.sysconfig.erb"),
|
||||
notify => Service["nfs"],
|
||||
}
|
||||
}
|
||||
"ubuntu": {
|
||||
package { "nfs-kernel-server":
|
||||
ensure => installed,
|
||||
}
|
||||
file { "/etc/default/nfs-kernel-server":
|
||||
ensure => present,
|
||||
mode => "0644",
|
||||
owner => "root",
|
||||
group => "root",
|
||||
content => template("nfs/nfs-kernel-server.erb"),
|
||||
require => Package["nfs-kernel-server"],
|
||||
notify => Service["nfs"],
|
||||
}
|
||||
}
|
||||
default: { }
|
||||
}
|
||||
|
||||
service { "nfs":
|
||||
|
@ -78,11 +128,11 @@ class nfs::server {
|
|||
/^([1-9]|1[0-5])$/ => "nfs",
|
||||
default => "nfs-server",
|
||||
},
|
||||
"ubuntu" => "nfs-kernel-server",
|
||||
default => "nfs",
|
||||
},
|
||||
enable => true,
|
||||
hasstatus => true,
|
||||
require => Service["nfslock"],
|
||||
}
|
||||
|
||||
exec { "exportfs":
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue