haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #4605 from berendt/vagrantfile_api_version 

Remove Vagrant constants
This commit is contained in:
Mitchell Hashimoto 2014-10-23 09:24:14 -07:00
parent b063c0ae05 e9a28b02a5
commit 503faca422
5 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
templates/commands/init/Vagrantfile.erb
View File

@ -1,10 +1,7 @@
# -*- mode: ruby -*- # -*- mode: ruby -*-
# vi: set ft=ruby : # vi: set ft=ruby :
# Vagrantfile API/syntax version. Don't touch unless you know what you're doing! Vagrant.configure(2) do |config|
VAGRANTFILE_API_VERSION = "2"
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# All Vagrant configuration is done here. The most common configuration # All Vagrant configuration is done here. The most common configuration
# options are documented and commented below. For a complete reference, # options are documented and commented below. For a complete reference,
# please see the online documentation at vagrantup.com. # please see the online documentation at vagrantup.com.

5
templates/commands/init/Vagrantfile.min.erb
View File

@ -1,10 +1,7 @@
# -*- mode: ruby -*- # -*- mode: ruby -*-
# vi: set ft=ruby : # vi: set ft=ruby :
# Vagrantfile API/syntax version. Don't touch unless you know what you're doing! Vagrant.configure(2) do |config|
VAGRANTFILE_API_VERSION = "2"
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.box = "<%= box_name %>" config.vm.box = "<%= box_name %>"
<% if box_url -%> <% if box_url -%>
config.vm.box_url = "<%= box_url %>" config.vm.box_url = "<%= box_url %>"

5
website/docs/Vagrantfile vendored
View File

@ -1,9 +1,6 @@
# -*- mode: ruby -*- # -*- mode: ruby -*-
# vi: set ft=ruby : # vi: set ft=ruby :
# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
VAGRANTFILE_API_VERSION = "2"
$script = <<SCRIPT $script = <<SCRIPT
sudo apt-get -y update sudo apt-get -y update
sudo apt-get -y install curl sudo apt-get -y install curl
@ -16,7 +13,7 @@ cd /vagrant
bundle bundle
SCRIPT SCRIPT
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| Vagrant.configure(2) do |config|
config.vm.box = "hashicorp/precise64" config.vm.box = "hashicorp/precise64"
config.vm.network "private_network", ip: "33.33.33.10" config.vm.network "private_network", ip: "33.33.33.10"
config.vm.provision "shell", inline: $script, privileged: false config.vm.provision "shell", inline: $script, privileged: false

4
website/docs/source/v2/vagrantfile/version.html.md
View File

@ -14,9 +14,7 @@ If you run `vagrant init` today, the Vagrantfile will be in roughly the
following format: following format:
```ruby ```ruby
VAGRANTFILE_API_VERSION = "2" Vagrant.configure(2) do |config|
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# ... # ...
end end
``` ```

5
website/www/Vagrantfile vendored
View File

@ -1,9 +1,6 @@
# -*- mode: ruby -*- # -*- mode: ruby -*-
# vi: set ft=ruby : # vi: set ft=ruby :
# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
VAGRANTFILE_API_VERSION = "2"
$script = <<SCRIPT $script = <<SCRIPT
sudo apt-get -y update sudo apt-get -y update
sudo apt-get -y install curl sudo apt-get -y install curl
@ -16,7 +13,7 @@ cd /vagrant
bundle bundle
SCRIPT SCRIPT
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| Vagrant.configure(2) do |config|
config.vm.box = "hashicorp/precise64" config.vm.box = "hashicorp/precise64"
config.vm.network "private_network", ip: "33.33.33.10" config.vm.network "private_network", ip: "33.33.33.10"
config.vm.provision "shell", inline: $script, privileged: false config.vm.provision "shell", inline: $script, privileged: false