beckermj/vaguerent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused experimental flag for disk enablement

Browse Source
This commit is contained in:
Brian Cain 2020-02-10 13:03:06 -08:00
parent 8af2e5c8be
commit b11aa53294
No known key found for this signature in database
GPG Key ID: 9FC4639B2E4510A0
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/kernel_v2/config/vm.rb
View File

@ -433,9 +433,8 @@ module VagrantPlugins
# Add provider config
disk_config.add_provider_config(provider_options, &block)
if !Vagrant::Util::Experimental.feature_enabled?("disk_base_config") &&
!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 `disk_base_config`. Disk will not be added to internal config, and will be ignored.")
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.")
return
end

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

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