v2.2.1

* Partial revert of service_provider Ubuntu hacks.

CHANGELOG.md

@@ -1,3 +1,14 @@
+v2.2.1
+------
+
+* Partial revert of service_provider Ubuntu hacks. 
+
+v2.2.0
+------
+
+* De-kludge service_provider hacks
+* Add pattern parameter to looped service resources
+
 v2.1.0
 ------
 

attributes/default.rb

@@ -66,7 +66,7 @@
     default['nfs']['packages'] = %w(nfs-utils portmap)
     default['nfs']['service']['portmap'] = 'portmap'
   elsif node['platform_version'].to_i >= 7
-    default['nfs']['service']['lock'] = 'rpc-statd'
+    default['nfs']['service']['lock'] = 'nfs-lock'
     default['nfs']['service']['server'] = 'nfs-server'
     default['nfs']['service']['idmap'] = 'nfs-idmap'
   end
@@ -112,19 +112,19 @@
   case node['platform']
 
   when 'ubuntu'
-    # Start with latest release, and work backwards
     default['nfs']['service']['portmap'] = 'rpcbind-boot'
     default['nfs']['service']['lock'] = 'statd'
     default['nfs']['service']['idmap'] = 'idmapd'
     default['nfs']['idmap']['pipefs_directory'] = '/run/rpc_pipefs'
     default['nfs']['service_provider']['idmap'] = Chef::Provider::Service::Upstart
     default['nfs']['service_provider']['portmap'] = Chef::Provider::Service::Upstart
     default['nfs']['service_provider']['lock'] = Chef::Provider::Service::Upstart
+    default['nfs']['service_provider']['server'] = Chef::Provider::Service::Upstart
 
-    # Ubuntu < 11.04 edge case package set and portmap name
-    if node['platform_version'].to_f <= 11.04
+    # Ubuntu 11.04 and 14.04 service script edge cases
+    if node['platform_version'].to_f <= 11.04 ||
+       node['platform_version'].to_f >= 14.04
       default['nfs']['service']['portmap'] = 'rpcbind'
     end
-
   end
 end

metadata.rb

@@ -4,7 +4,7 @@
 description 'Installs and configures nfs, and NFS exports'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
 name 'nfs'
-version '2.1.0'
+version '2.2.1'
 recipe 'nfs', 'Installs and configures nfs client components'
 recipe 'nfs::server', 'Installs and configures nfs server components'
 recipe 'nfs::client4', 'NFSv4 client components'

recipes/_common.rb

@@ -42,9 +42,9 @@
 %w(portmap lock).each do |component|
   service component do
     service_name node['nfs']['service'][component]
+    pattern node['nfs']['service'][component]
     provider node['nfs']['service_provider'][component]
     action [:start, :enable]
     supports :status => true
-    not_if "service #{component} status | grep -q running"
   end
 end