diff --git a/lib/vagrant/vagrantfile.rb b/lib/vagrant/vagrantfile.rb index 7ee8a2d06..5ac4bf987 100644 --- a/lib/vagrant/vagrantfile.rb +++ b/lib/vagrant/vagrantfile.rb @@ -195,7 +195,7 @@ module Vagrant box = boxes.find(config.vm.box, box_formats, config.vm.box_version) if box box_vagrantfile = find_vagrantfile(box.directory) - if box_vagrantfile && !config.vm.box_ignore_box_vagrantfile + if box_vagrantfile && !config.vm.ignore_box_vagrantfile box_config_key = "#{boxes.object_id}_#{box.name}_#{box.provider}".to_sym @loader.set(box_config_key, box_vagrantfile) diff --git a/plugins/kernel_v2/config/vm.rb b/plugins/kernel_v2/config/vm.rb index 1ff3c95bb..6ed45729c 100644 --- a/plugins/kernel_v2/config/vm.rb +++ b/plugins/kernel_v2/config/vm.rb @@ -22,7 +22,7 @@ module VagrantPlugins attr_accessor :base_mac attr_accessor :boot_timeout attr_accessor :box - attr_accessor :box_ignore_box_vagrantfile + attr_accessor :ignore_box_vagrantfile attr_accessor :box_check_update attr_accessor :box_url attr_accessor :box_server_url @@ -52,7 +52,7 @@ module VagrantPlugins @base_mac = UNSET_VALUE @boot_timeout = UNSET_VALUE @box = UNSET_VALUE - @box_ignore_box_vagrantfile = UNSET_VALUE + @ignore_box_vagrantfile = UNSET_VALUE @box_check_update = UNSET_VALUE @box_download_ca_cert = UNSET_VALUE @box_download_ca_path = UNSET_VALUE @@ -379,8 +379,7 @@ module VagrantPlugins @base_mac = nil if @base_mac == UNSET_VALUE @boot_timeout = 300 if @boot_timeout == UNSET_VALUE @box = nil if @box == UNSET_VALUE - - @box_ignore_box_vagrantfile = false if @box_ignore_box_vagrantfile == UNSET_VALUE + @ignore_box_vagrantfile = false if @ignore_box_vagrantfile == UNSET_VALUE if @box_check_update == UNSET_VALUE @box_check_update = !present?(ENV["VAGRANT_BOX_UPDATE_CHECK_DISABLE"]) diff --git a/website/source/docs/vagrantfile/machine_settings.html.md b/website/source/docs/vagrantfile/machine_settings.html.md index 7d6fe9a19..2854e5c40 100644 --- a/website/source/docs/vagrantfile/machine_settings.html.md +++ b/website/source/docs/vagrantfile/machine_settings.html.md @@ -138,6 +138,11 @@ on the guest with the configured hostname.
+`config.vm.ignore_box_vagrantfile` - If true, Vagrant will not load the the +settings found inside a boxes Vagrantfile, if present. Defaults to `false`. + +
+ `config.vm.network` - Configures [networks](/docs/networking/) on the machine. Please see the networking page for more information.