From 8006766691ed0944293a75c1947d139a6f76a896 Mon Sep 17 00:00:00 2001 From: Fabio Rehm Date: Thu, 27 Jun 2013 10:39:14 -0300 Subject: [PATCH] Tks to @stucki work on #92 there is no need to do this anymore :) --- development/Vagrantfile | 2 +- example/Vagrantfile | 16 +--------------- spec/Vagrantfile | 5 +---- 3 files changed, 3 insertions(+), 20 deletions(-) diff --git a/development/Vagrantfile b/development/Vagrantfile index f8f9d10..03ab7a1 100644 --- a/development/Vagrantfile +++ b/development/Vagrantfile @@ -72,7 +72,7 @@ Vagrant.configure("2") do |config| if box_config[:lxc_url] vm_config.vm.provider :lxc do |lxc, lxc_config| lxc_config.vm.box_url = box_config[:lxc_url] - lxc_config.vm.hostname = 'lxc-dev-box' unless %w(squeeze wheezy sid).include? box_name.to_s + lxc_config.vm.hostname = 'lxc-dev-box' # Required to boot nested containers lxc.customize 'aa_profile', 'unconfined' unless %w(squeeze wheezy sid).include? box_name.to_s diff --git a/example/Vagrantfile b/example/Vagrantfile index b8dc05f..faf8564 100644 --- a/example/Vagrantfile +++ b/example/Vagrantfile @@ -28,7 +28,7 @@ echo "Hi there I'm a shell script used for provisioning" end port = 8080 - releases = %w(precise quantal raring) + releases = %w(precise quantal raring wheezy squeeze sid) releases.each do |release| config.vm.define(release) do |lxc_config| lxc_config.vm.box = "#{release}64" @@ -39,18 +39,4 @@ echo "Hi there I'm a shell script used for provisioning" lxc_config.vm.hostname = "lxc-#{release}64-example" end end - - port = 8090 - releases = %w(wheezy squeeze sid) - releases.each do |release| - config.vm.define(release) do |lxc_config| - lxc_config.vm.box = "#{release}64" - lxc_config.vm.box_url = "http://dl.dropbox.com/u/13510779/lxc-#{release}-amd64-2013-05-08.box" - lxc_config.vm.network :forwarded_port, guest: 80, host: (port += 1) - # Uncomment if you want to try out a box built locally - # lxc_config.vm.box_url = "../boxes/output/lxc-#{release}64.box" - # Does not work yet: - # lxc_config.vm.hostname = "lxc-#{release}64-example" - end - end end diff --git a/spec/Vagrantfile b/spec/Vagrantfile index 2364852..e155eaa 100644 --- a/spec/Vagrantfile +++ b/spec/Vagrantfile @@ -8,10 +8,7 @@ ENV['BOX_NAME'] ||= 'quantal64' Vagrant.configure("2") do |config| config.vm.box = ENV['BOX_NAME'] - # FIXME: Find out why this does not work for debian boxes - unless %w( squeeze64 wheezy64 sid64 ).include? config.vm.box - config.vm.hostname = 'lxc-test-box' - end + config.vm.hostname = 'lxc-test-box' config.cache.enable :apt