From 16c8ff9013994e87aebe034dd2f0a5e5b82b81c7 Mon Sep 17 00:00:00 2001 From: Fabio Rehm Date: Sun, 7 Jul 2013 22:30:40 -0300 Subject: [PATCH] Remove support for building V3 base boxes with chef --- tasks/boxes.v3.rake | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/tasks/boxes.v3.rake b/tasks/boxes.v3.rake index bc094dc..b5002f9 100644 --- a/tasks/boxes.v3.rake +++ b/tasks/boxes.v3.rake @@ -54,7 +54,6 @@ class BuildUbuntuBoxTaskV3 < BuildGenericBoxTaskV3 end end -chef = ENV['CHEF'] == '1' puppet = ENV['PUPPET'] == '1' babushka = ENV['BABUSHKA'] == '1' @@ -66,41 +65,39 @@ namespace :boxes do desc 'Build an Ubuntu Precise 64 bits box' BuildUbuntuBoxTaskV3. new(:precise64, - :precise, 'amd64', chef: chef, puppet: puppet, babushka: babushka) + :precise, 'amd64', puppet: puppet, babushka: babushka) desc 'Build an Ubuntu Quantal 64 bits box' BuildUbuntuBoxTaskV3. new(:quantal64, - :quantal, 'amd64', chef: chef, puppet: puppet, babushka: babushka) + :quantal, 'amd64', puppet: puppet, babushka: babushka) - # FIXME: Find out how to install chef on raring desc 'Build an Ubuntu Raring 64 bits box' BuildUbuntuBoxTaskV3. new(:raring64, - :raring, 'amd64', chef: chef, puppet: puppet, babushka: babushka) + :raring, 'amd64', puppet: puppet, babushka: babushka) desc 'Build all Ubuntu boxes' task :all => %w( precise64 quantal64 raring64 ) end end - # FIXME: Find out how to install chef on debian boxes namespace :debian do namespace :build do desc 'Build an Debian Squeeze 64 bits box' BuildDebianBoxTaskV3. new(:squeeze64, - :squeeze, 'amd64', chef: false, puppet: puppet, babushka: babushka) + :squeeze, 'amd64', puppet: puppet, babushka: babushka) desc 'Build an Debian Wheezy 64 bits box' BuildDebianBoxTaskV3. new(:wheezy64, - :wheezy, 'amd64', chef: false, puppet: puppet, babushka: babushka) + :wheezy, 'amd64', puppet: puppet, babushka: babushka) desc 'Build an Debian Sid/unstable 64 bits box' BuildDebianBoxTaskV3. new(:sid64, - :sid, 'amd64', chef: false, puppet: puppet, babushka: babushka) + :sid, 'amd64', puppet: puppet, babushka: babushka) desc 'Build all Debian boxes' task :all => %w( squeeze64 wheezy64 sid64 )