upstream/vagrant
1
0
Fork 0
mirror of https://github.com/hashicorp/vagrant.git synced 2026-05-28 04:36:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Update experimental feature flag for disk

Browse source
This commit is contained in:
Brian Cain 2020-02-12 15:38:34 -08:00
parent c179b2fb22
commit dafb60ad4f
No known key found for this signature in database
GPG key ID: 9FC4639B2E4510A0
7 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/kernel_v2/config/vm.rb
View file

@ -433,8 +433,8 @@ module VagrantPlugins
# Add provider config
disk_config.add_provider_config(provider_options, &block)
if !Vagrant::Util::Experimental.feature_enabled?("virtualbox_disk_hdd")
@logger.warn("Disk config defined, but experimental feature is not enabled. To use this feature, enable it with the experimental flag `virtualbox_disk_hdd`. Disk will not be added to internal config, and will be ignored.")
if !Vagrant::Util::Experimental.feature_enabled?("disks")
@logger.warn("Disk config defined, but experimental feature is not enabled. To use this feature, enable it with the experimental flag `disks`. Disk will not be added to internal config, and will be ignored.")
return
end

2
plugins/providers/virtualbox/cap/cleanup_disks.rb
View file

@ -13,7 +13,7 @@ module VagrantPlugins
def self.cleanup_disks(machine, defined_disks, disk_meta_file)
return if disk_meta_file.values.flatten.empty?
return if !Vagrant::Util::Experimental.feature_enabled?("virtualbox_disk_hdd")
return if !Vagrant::Util::Experimental.feature_enabled?("disks")
handle_cleanup_disk(machine, defined_disks, disk_meta_file["disk"])
# TODO: Floppy and DVD disks

2
plugins/providers/virtualbox/cap/configure_disks.rb
View file

@ -18,7 +18,7 @@ module VagrantPlugins
def self.configure_disks(machine, defined_disks)
return {} if defined_disks.empty?
return {} if !Vagrant::Util::Experimental.feature_enabled?("virtualbox_disk_hdd")
return {} if !Vagrant::Util::Experimental.feature_enabled?("disks")
if defined_disks.size > MAX_DISK_NUMBER
# you can only attach up to 30 disks per controller, INCLUDING the primary disk

2
test/unit/plugins/kernel_v2/config/vm_test.rb
View file

@ -556,7 +556,7 @@ describe VagrantPlugins::Kernel_V2::VMConfig do
describe "#disk" do
before(:each) do
allow(Vagrant::Util::Experimental).to receive(:feature_enabled?).
with("virtualbox_disk_hdd").and_return("true")
with("disks").and_return("true")
end
it "stores the disks" do

2
website/source/docs/disks/usage.html.md
View file

@ -16,7 +16,7 @@ description: |-
This feature currently reqiures the experimental flag to be used. To explicitly enable this feature, you can set the experimental flag to:
```
VAGRANT_EXPERIMENTAL="virtualbox_disk_hdd"
VAGRANT_EXPERIMENTAL="disks"
```
Please note that `VAGRANT_EXPERIMENTAL` is an environment variable. For more

2
website/source/docs/disks/virtualbox/index.html.md
View file

@ -17,7 +17,7 @@ description: |-
This feature currently reqiures the experimental flag to be used. To explicitly enable this feature, you can set the experimental flag to:
```
VAGRANT_EXPERIMENTAL="virtualbox_disk_hdd"
VAGRANT_EXPERIMENTAL="disks"
```
Please note that `VAGRANT_EXPERIMENTAL` is an environment variable. For more

2
website/source/docs/disks/virtualbox/usage.html.md
View file

@ -17,7 +17,7 @@ description: |-
This feature currently reqiures the experimental flag to be used. To explicitly enable this feature, you can set the experimental flag to:
```
VAGRANT_EXPERIMENTAL="virtualbox_disk_hdd"
VAGRANT_EXPERIMENTAL="disks"
```
Please note that `VAGRANT_EXPERIMENTAL` is an environment variable. For more