Skip to content

Commit

Permalink
Include docker::lxc even when node['docker']['install_type'] == 'pack…
Browse files Browse the repository at this point in the history
…age'
  • Loading branch information
carmstrong committed Mar 28, 2014
1 parent a3a7c77 commit b295622
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions recipes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down

0 comments on commit b295622

Please sign in to comment.