haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make sure provider config is always available even if no block was given

This commit is contained in:
Mitchell Hashimoto 2012-12-23 10:59:26 -08:00
parent 6478139cee
commit 553d4a828a
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
plugins/kernel_v2/config/vm_provider.rb
View File

@ -19,30 +19,17 @@ module VagrantPlugins
@config = nil
@logger = Log4r::Logger.new("vagrant::config::vm::provider")
# If we were given a block to configure with, then let's try
# to do that.
load_config(block) if block
end
protected
# This takes the config block given to define the provider and
# attempts to turn this into a real configuration object. If the
# provider plugin is not found then it is simply ignored. This allows
# people to share Vagrantfiles that have configuration for providers
# which may not be setup on every user's system.
#
# @param [Proc] config_proc
def load_config(config_proc)
# Attempt to find the configuration class for this provider and
# load the configuration.
config_class = Vagrant.plugin("2").manager.provider_configs[@name]
if !config_class
@logger.info("Provider config for #{@name} not found, ignoring that config.")
@logger.info("Provider config for #{@name} not found, ignoring config.")
return
end
@logger.info("Configuring provider #{@name} with #{config_class}")
@config = config_class.new
config_proc.call(@config)
block.call(@config) if block
end
end
end