Merge pull request #56 from echocat/develop

backmerge for 1.7.2
echocat · Jan 8, 2016 · ac76a72 · ac76a72
2 parents f5eccf7 + 91146ca
commit ac76a72
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 2016-01-08 - 1.7.2 (Bugfix release)
+
+#### Bugfixes:
+
+- (174a9b4) #53 Debian do not stop (nonexisting) service, when using nfs-v3
+- (21c2a1d) #54 #55 Debian/Ubuntu enable the idmapd service on boot, when using nfs-v3
+
 ## 2015-10-23 - 1.7.1 (Bugfix release)
 
 #### Bugfixes:

diff --git a/manifests/client/debian/service.pp b/manifests/client/debian/service.pp
@@ -9,10 +9,9 @@
   if $nfs::client::debian::nfs_v4 {
     service { 'idmapd':
       ensure    => running,
+      enable    => true,
       name      => 'nfs-common',
       subscribe => Augeas['/etc/idmapd.conf', '/etc/default/nfs-common'],
     }
-  } else {
-    service { 'idmapd': ensure => stopped, }
   }
 }
diff --git a/manifests/client/ubuntu/service.pp b/manifests/client/ubuntu/service.pp
@@ -9,9 +9,13 @@
   if $nfs::client::ubuntu::nfs_v4 {
     service { 'idmapd':
       ensure    => running,
+      enable    => true,
       subscribe => Augeas['/etc/idmapd.conf', '/etc/default/nfs-common'],
     }
   } else {
-    service { 'idmapd': ensure => stopped, }
+    service { 'idmapd':
+      ensure => stopped,
+      enable => false,
+    }
   }
 }
diff --git a/metadata.json b/metadata.json
@@ -60,7 +60,7 @@
     }
   ],
   "name": "echocat-nfs",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "source": "git clone https://github.com/echocat/puppet-nfs.git",
   "author": "echocat",
   "license": "Apache-2.0",

diff --git a/spec/classes/client_debian_spec.rb b/spec/classes/client_debian_spec.rb
@@ -10,9 +10,6 @@
       'ensure' => 'running'
     )
 
-    should contain_service('idmapd').with(
-      'ensure' => 'stopped'
-    )
     should contain_package('nfs-common')
     should contain_package('rpcbind')