From 788d6b4c22dbfc5f4bdc05073acef672ec2ba2ed Mon Sep 17 00:00:00 2001
From: Timo Makinen <tmakinen@foo.sh>
Date: Wed, 1 Feb 2017 13:24:56 +0200
Subject: [PATCH] nfs: Fix statd service name for Ubuntu 16.04.

---
 nfs/manifests/init.pp | 37 ++++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/nfs/manifests/init.pp b/nfs/manifests/init.pp
index 08c4cbf..0cacd8c 100644
--- a/nfs/manifests/init.pp
+++ b/nfs/manifests/init.pp
@@ -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"],
     }