From 73fc70904c36d42141baef39ae4378cb000f93ad Mon Sep 17 00:00:00 2001 From: secondhans <tweedehans@byte.nl> Date: Thu, 25 Jun 2015 13:19:18 +0200 Subject: [PATCH 1/4] do not stop (nonexisting) service on debian when using nfs-v3 --- manifests/client/debian/service.pp | 2 -- spec/classes/client_debian_spec.rb | 3 --- 2 files changed, 5 deletions(-) diff --git a/manifests/client/debian/service.pp b/manifests/client/debian/service.pp index 0d0537f..3bc0b1d 100644 --- a/manifests/client/debian/service.pp +++ b/manifests/client/debian/service.pp @@ -15,7 +15,5 @@ name => 'nfs-common', subscribe => Augeas['/etc/idmapd.conf', '/etc/default/nfs-common'], } - } else { - service { 'idmapd': ensure => stopped, } } } diff --git a/spec/classes/client_debian_spec.rb b/spec/classes/client_debian_spec.rb index 357cb14..bcfa3a2 100644 --- 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') From b55d4d7838d3d4a48242dc67d3913bb3c3b9b545 Mon Sep 17 00:00:00 2001 From: Daniel Sung <Daniel.sung@me.com> Date: Thu, 7 Jan 2016 17:20:42 +0000 Subject: [PATCH 2/4] Enable the idmapd service so that it starts on boot If the idmapd service is disabled, make sure it is enabled on Ubuntu if NFSv4 is configured. Also make sure that it is disabled if NFSv4 is not configured otherwise it would start on boot. --- manifests/client/ubuntu/service.pp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/manifests/client/ubuntu/service.pp b/manifests/client/ubuntu/service.pp index e5fcc2f..bea31c8 100644 --- 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, + } } } From 0c275c76ba2855a68b5eda39bb4fb72541b3c8a2 Mon Sep 17 00:00:00 2001 From: Daniel Sung <Daniel.sung@me.com> Date: Fri, 8 Jan 2016 09:27:11 +0000 Subject: [PATCH 3/4] Enable idmapd service resource on Debian when NFSv4 configured --- manifests/client/debian/service.pp | 1 + 1 file changed, 1 insertion(+) diff --git a/manifests/client/debian/service.pp b/manifests/client/debian/service.pp index ecca3ae..9205b80 100644 --- a/manifests/client/debian/service.pp +++ b/manifests/client/debian/service.pp @@ -9,6 +9,7 @@ if $nfs::client::debian::nfs_v4 { service { 'idmapd': ensure => running, + enable => true, name => 'nfs-common', subscribe => Augeas['/etc/idmapd.conf', '/etc/default/nfs-common'], } From 91146caf54f82d3dfc9b8a6080db97cc6bece2ce Mon Sep 17 00:00:00 2001 From: Daniel Werdermann <dwerdermann@web.de> Date: Fri, 8 Jan 2016 15:54:30 +0100 Subject: [PATCH 4/4] prepare release 1.7.2 --- CHANGELOG.md | 7 +++++++ metadata.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3b6d24..3637af7 100644 --- 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/metadata.json b/metadata.json index 2848bab..79841e0 100644 --- 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",