From 6d564bd25df4fc492a64d87c65200af29b99e32d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20M=E4kinen?= <tmakinen@foo.sh>
Date: Thu, 26 Jul 2012 14:01:59 +0300
Subject: [PATCH] Fixed some depency errors from nfs module and cleaned up some
 lint errors.

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

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