Merge pull request #102 from carmstrong/install_lxc_on_ubuntu

Explicitly install lxc on Ubuntu (fixes #101)
sous-chefs · Mar 29, 2014 · 00fbd9e · 00fbd9e
2 parents 025c622 + b295622
commit 00fbd9e
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/recipes/default.rb b/recipes/default.rb
@@ -9,13 +9,15 @@
   end
 end
 
-include_recipe 'docker::cgroups' if node['docker']['exec_driver'] == 'lxc'
+if node['docker']['exec_driver'] == 'lxc'
+  include_recipe 'docker::cgroups'
+  include_recipe 'docker::lxc'
+end
 
 unless node['docker']['install_type'] == 'package'
   if node['platform'] == 'ubuntu' && Chef::VersionConstraint.new('< 13.10').include?(node['platform_version'])
     include_recipe "docker::#{node['docker']['storage_driver']}" if node['docker']['storage_driver']
   end
-  include_recipe 'docker::lxc' if node['docker']['exec_driver'] == 'lxc'
   if node['docker']['install_type'] == 'source'
     include_recipe 'golang'
     include_recipe 'git'