From b11aa532946abe4616ae60bc71d9e4ec126d861a Mon Sep 17 00:00:00 2001 From: Brian Cain Date: Mon, 10 Feb 2020 13:03:06 -0800 Subject: [PATCH] Remove unused experimental flag for disk enablement --- plugins/kernel_v2/config/vm.rb | 5 ++--- test/unit/plugins/kernel_v2/config/vm_test.rb | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/plugins/kernel_v2/config/vm.rb b/plugins/kernel_v2/config/vm.rb index b2fe0550d..a2b9f35f8 100644 --- a/plugins/kernel_v2/config/vm.rb +++ b/plugins/kernel_v2/config/vm.rb @@ -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 diff --git a/test/unit/plugins/kernel_v2/config/vm_test.rb b/test/unit/plugins/kernel_v2/config/vm_test.rb index e86db848f..58b058295 100644 --- a/test/unit/plugins/kernel_v2/config/vm_test.rb +++ b/test/unit/plugins/kernel_v2/config/vm_test.rb @@ -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