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

Merge pull request #7387 from phyber/fix/master/prepare_nfs_settings_scoped_hash_overrides_fix 

Fix/master/prepare_nfs_settings scoped hash overrides fix
This commit is contained in:
Seth Vargo 2016-06-06 18:41:13 -04:00
parent e9ccc0a357 60fd777806
commit 073e65abf0
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/providers/virtualbox/action/prepare_nfs_settings.rb
View File

@ -90,6 +90,8 @@ module VagrantPlugins
def read_static_machine_ips
ips = []
@machine.config.vm.networks.each do |type, options|
options = scoped_hash_override(options, :virtualbox)
if type == :private_network && options[:type] != :dhcp && options[:ip].is_a?(String)
ips << options[:ip]
end

9
test/unit/plugins/providers/virtualbox/action/prepare_nfs_settings_test.rb
View File

@ -125,5 +125,14 @@ describe VagrantPlugins::ProviderVirtualBox::Action::PrepareNFSSettings do
expect(env[:nfs_host_ip]).to eq("1.2.3.4")
expect(env[:nfs_machine_ip]).to eq(["11.12.13.14", "2.3.4.5"])
end
it "allows the use of scoped hash overrides as options" do
env[:machine].config.vm.network :private_network, virtualbox__ip: "11.12.13.14"
subject.call(env)
expect(env[:nfs_host_ip]).to eq("1.2.3.4")
expect(env[:nfs_machine_ip]).to eq(["11.12.13.14", "2.3.4.5"])
end
end
end