Merge PR#219 - Explicity set Upstart provider

Explicity set the upstart provider for cgroups.
sous-chefs · Oct 29, 2014 · c492b54 · c492b54
1 parent 70c46e3
commit c492b54
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,9 +11,10 @@ Attribute deprecations:
 * container LWRP public_port attribute: use port attribute instead
 * container LWRP networking attribute: use net attribute instead
 
-## 0.35.3 (unreleased)
+## 0.35.3
 * Bugfix: [#217][]: Explicitly set key and keyserver for docker apt repository.
 * Improvement: Pull in sysv init.d script changes from upstream.
+* Bugfix: [#219][]: Explicitly set Upstart provider for Ubuntu 14.04 and 14.10.
 * Improvement: [#220][]: Create graph directory if it is specified.
 
 ## 0.35.2

diff --git a/recipes/cgroups.rb b/recipes/cgroups.rb
@@ -23,7 +23,7 @@
     service 'cgroup-lite' do
       action :start
       # WORKAROUND: CHEF-5276, fixed in Chef 11.14
-      provider Chef::Provider::Service::Upstart if node['platform_version'] == '14.04'
+      provider Chef::Provider::Service::Upstart if %w(14.04 14.10).include?(node['platform_version'])
     end
   end
 end