Merge lp:~zyga/checkbox/vagrant into lp:checkbox

Proposed by Zygmunt Krynicki
Status: Merged
Approved by: Sylvain Pineau
Approved revision: 3623
Merged at revision: 3623
Proposed branch: lp:~zyga/checkbox/vagrant
Merge into: lp:checkbox
Diff against target: 42 lines (+4/-22)
1 file modified
Vagrantfile (+4/-22)
To merge this branch: bzr merge lp:~zyga/checkbox/vagrant
Reviewer Review Type Date Requested Status
Sylvain Pineau Approve
Review via email: mp+253477@code.launchpad.net

Description of the change

This branch allows everyone to use the current vagrant version and removes environments we don't need anymore.

11afb5a vagrant: modernize vagrant configuration
2f89687 vagrant: remove obsolete vagrant configs

To post a comment you must log in.
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

+1 for removing older settings/releases

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Vagrantfile'
2--- Vagrantfile 2014-05-05 19:39:51 +0000
3+++ Vagrantfile 2015-03-19 08:48:03 +0000
4@@ -1,9 +1,9 @@
5 # -*- mode: ruby -*-
6 # vi: set ft=ruby sw=2 ts=2 :
7-
8-Vagrant::Config.run do |config|
9-
10- config.ssh.timeout = 60
11+Vagrant.require_version ">= 1.7.2"
12+Vagrant.configure("2") do |config|
13+
14+ config.vm.provider "virtualbox"
15
16 # Define a Ubuntu Server image (cloud) for the 12.04 release (precise)
17 config.vm.define :precise do |precise_config|
18@@ -11,24 +11,6 @@
19 precise_config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-i386-vagrant-disk1.box"
20 end
21
22- # Define a Ubuntu Server image (cloud) for the 12.10 release (quantal)
23- config.vm.define :quantal do |quantal_config|
24- quantal_config.vm.box = "quantal-cloud-i386"
25- quantal_config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/quantal/current/quantal-server-cloudimg-i386-vagrant-disk1.box"
26- end
27-
28- # Define a Ubuntu Server image (cloud) for the 13.04 release (raring)
29- config.vm.define :raring do |raring_config|
30- raring_config.vm.box = "raring-cloud-i386"
31- raring_config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/raring/current/raring-server-cloudimg-i386-vagrant-disk1.box"
32- end
33-
34- # Define a Ubuntu Server image (cloud) for the 13.10 release (saucy)
35- config.vm.define :saucy do |saucy_config|
36- saucy_config.vm.box = "saucy-cloud-i386"
37- saucy_config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/saucy/current/saucy-server-cloudimg-i386-vagrant-disk1.box"
38- end
39-
40 # Define a Ubuntu Server image (cloud) for the 14.04 release (trusty)
41 config.vm.define :trusty do |trusty_config|
42 trusty_config.vm.box = "trusty-cloud-i386"

Subscribers

People subscribed via source and target branches