From b29562267f6ddf5abb4e79dbd41491d9f7bfe410 Mon Sep 17 00:00:00 2001 From: Chris Armstrong Date: Thu, 27 Mar 2014 17:45:28 -0700 Subject: [PATCH] Include docker::lxc even when node['docker']['install_type'] == 'package' --- recipes/default.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/recipes/default.rb b/recipes/default.rb index f019db11de..2992100a95 100644 --- 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'