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

nfs: Fix statd service name for Ubuntu 16.04.

Browse source
This commit is contained in:
Timo Makinen 2017-02-01 13:24:56 +02:00
parent 27db7591d7
commit 788d6b4c22
1 changed files with 24 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

37
nfs/manifests/init.pp
View file

@ -13,12 +13,24 @@ class nfs::client {
}
case $::operatingsystem {
"centos", "redhat": {
if versioncmp($::operatingsystemrelease, "7") < 0 {
$service = "nfslock"
} else {
$service = "rpc-statd"
}
}
"fedora": {
# https://bugzilla.redhat.com/show_bug.cgi?id=692008
service { "NetworkManager-wait-online":
ensure => stopped,
enable => true,
}
if versioncmp($::operatingsystemrelease, "16") < 0 {
$service = "nfslock"
} else {
$service = "rpc-statd"
}
}
"ubuntu": {
file { "/etc/modprobe.d/lockd.conf":
@ -35,25 +47,24 @@ class nfs::client {
notify => Service["nfslock"],
require => Package["nfs-utils"],
}
if versioncmp($::operatingsystemrelease, "16.04") < 0 {
$service = "statd"
} else {
$service = "rpc-statd"
}
}
"debian": {
$service = "statd"
}
default: {
$service = "nfslock"
}
default: { }
}
service { "nfslock":
ensure => running,
enable => true,
name => $::operatingsystem ? {
"centos" => $::operatingsystemrelease ? {
/^[1-6]/ => "nfslock",
default => "rpc-statd",
},
"fedora" => $::operatingsystemrelease ? {
/^([1-9]|1[0-5])$/ => "nfslock",
default => "nfs-lock",
},
"ubuntu" => "statd",
default => "nfslock",
},
name => $service,
hasstatus => true,
require => Package["nfs-utils"],
}