Bugfix: NFS daemon failed to start on RHEL/CentOS

diff --git a/README.md b/README.md
index d5bc5bb61696fcc27b948b104d1bad980634e568..f4cf65556dfd32836787e48698e382339e64d549 100644 (file)
--- a/README.md
+++ b/README.md
@@ -8,6 +8,7 @@
 
 * Debian 5 (Lenny)
 * Debian 6 (Squeeze)
+* CentOS 6
 
 ## Example usage
 

diff --git a/manifests/install.pp b/manifests/install.pp
index c7665ba89227aee608065062a0c8ba4c74859760..c9e9e563239aeeabe38a745e8f67c2ed7eb452aa 100644 (file)
--- a/manifests/install.pp
+++ b/manifests/install.pp
@@ -2,37 +2,17 @@
 #
 class nfs::install {
 
-  case $::osfamily {
-    'RedHat': {
-      # Both client and server are installed using
-      # a single package on RHEL
-
-      if $::nfs::client or $::nfs::server {
-        package { $::nfs::pkg_list_client:
-          ensure => $::nfs::pkg_ensure;
-        }
-      }
-    }
-
-    'Debian': {
-      # On Debian client and server packages are split.
-
-      if $::nfs::client {
-        package { $::nfs::pkg_list_client:
-          ensure => $::nfs::pkg_ensure;
-        }
-      }
-
-      if $::nfs::server {
-        package { $::nfs::pkg_list_server:
-          ensure => $::nfs::pkg_ensure;
-        }
-      }
+  if $::nfs::client {
+    package { $::nfs::pkg_list_client:
+      ensure => $::nfs::pkg_ensure;
     }
+  }
 
-    default: {
-      fail "Operating system ${::operatingsystem} is not supported yet."
+  if $::nfs::server {
+    package { $::nfs::pkg_list_server:
+      ensure => $::nfs::pkg_ensure;
     }
   }
+
 }
 

diff --git a/manifests/params.pp b/manifests/params.pp
index ea48a871e25173bc322c5a4b9d8da3e3fbee5d64..db46c24c8ddb766477a915c3e82eb4aeb3ac1313 100644 (file)
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -14,7 +14,7 @@ class nfs::params {
       $config_user        = 'root'
       $pkg_ensure         = present
       $pkg_list_client    = 'nfs-utils'
-      $pkg_list_server    = 'nfs-utils'
+      $pkg_list_server    = 'rpcbind'
       $service_enable     = true
       $service_ensure     = running
       $service_hasrestart = true

diff --git a/manifests/service.pp b/manifests/service.pp
index 952f90df6d4d2cc945fb022e67703ca5daad859d..e012fe6e339a735a298260cc6c03e440c4bb457c 100644 (file)
--- a/manifests/service.pp
+++ b/manifests/service.pp
@@ -2,11 +2,32 @@
 #
 class nfs::service {
   if $::nfs::server {
-    service { $::nfs::service_name:
-      ensure    => $::nfs::service_ensure,
-      enable    => $::nfs::service_enable,
-      hasstatus => $::nfs::service_hasstatus,
-      require   => Class['::nfs::config'];
+
+    if $::osfamily == 'RedHat' {
+
+      service { 'rpcbind':
+        ensure    => $::nfs::service_ensure,
+        enable    => $::nfs::service_enable,
+        hasstatus => $::nfs::service_hasstatus,
+        require   => Class['::nfs::config'];
+      }
+
+      service { $::nfs::service_name:
+        ensure    => $::nfs::service_ensure,
+        enable    => $::nfs::service_enable,
+        hasstatus => $::nfs::service_hasstatus,
+        require   => [ Class['::nfs::config'], Service['rpcbind'], ];
+      }
+
+    } else {
+
+      service { $::nfs::service_name:
+        ensure    => $::nfs::service_ensure,
+        enable    => $::nfs::service_enable,
+        hasstatus => $::nfs::service_hasstatus,
+        require   => Class['::nfs::config'];
+      }
+
     }
   }
 }