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

core: load ".vagrantplugins" in root path [GH-3775]

This commit is contained in:
Mitchell Hashimoto 2014-10-23 19:58:57 -07:00
parent 3c81264714
commit fbd568a03e
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -12,6 +12,8 @@ IMPROVEMENTS:
- core: `has_plugin?` function now takes a second argument which is a - core: `has_plugin?` function now takes a second argument which is a
version constraint requirement. [GH-4650] version constraint requirement. [GH-4650]
- core: ".vagrantplugins" file in the same file as your Vagrantfile
will be loaded for defining inline plugins. [GH-3775]
- commands/plugin: Plugin list machine-readable output contains the plugin - commands/plugin: Plugin list machine-readable output contains the plugin
name as the target for versions and other info. [GH-4506] name as the target for versions and other info. [GH-4506]
- guests/arch: Support predictable network interface naming. [GH-4468] - guests/arch: Support predictable network interface naming. [GH-4468]

9
lib/vagrant/environment.rb
View File

@ -164,6 +164,15 @@ module Vagrant
@local_data_path = Pathname.new(File.expand_path(opts[:local_data_path], @cwd)) @local_data_path = Pathname.new(File.expand_path(opts[:local_data_path], @cwd))
end end
# If we have a root path, load the ".vagrantplugins" file.
if root_path
plugins_file = root_path.join(".vagrantplugins")
if plugins_file.file?
@logger.info("Loading plugins file: #{plugins_file}")
load plugins_file
end
end
setup_local_data_path setup_local_data_path
# Setup the default private key # Setup the default private key