From bad6537e86d8f1a66f0bbe50fcf7b5bc662e4c82 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Fri, 18 Apr 2014 20:36:29 -0700 Subject: [PATCH] kernel/v2: provider configs do proper merge logic for config --- plugins/kernel_v2/config/vm.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/kernel_v2/config/vm.rb b/plugins/kernel_v2/config/vm.rb index c41c02f0c..867f6cc41 100644 --- a/plugins/kernel_v2/config/vm.rb +++ b/plugins/kernel_v2/config/vm.rb @@ -379,11 +379,13 @@ module VagrantPlugins config_class ||= Vagrant::Config::V2::DummyConfig # Load it up - config = config_class.new + config = config_class.new begin blocks.each do |b| - b.call(config, Vagrant::Config::V2::DummyConfig.new) + new_config = config_class.new + b.call(new_config, Vagrant::Config::V2::DummyConfig.new) + config = config.merge(new_config) end rescue Exception => e raise Vagrant::Errors::VagrantfileLoadError,