kienan
/
vagrant-hostmanager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tweaking couple of code review suggestions

This commit is contained in:
Lukasz Jastrzebski 2014-01-10 20:51:50 -08:00
parent 1b63859a57
commit 566d1f2e3b
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -81,10 +81,11 @@ where host name is stored in ssh_info hash of each machine.
This causes generation of invalid /etc/hosts file. This causes generation of invalid /etc/hosts file.
Custom IP resolver gives you oportunity to calculate IP address Custom IP resolver gives you oportunity to calculate IP address
for each machine by yourself. For example: for each machine by yourself, giving You also access to the machine that is
updating /etc/hosts. For example:
```ruby ```ruby
config.hostmanager.ip_resolver = proc do |vm| config.hostmanager.ip_resolver = proc do |vm, resolving_vm|
if hostname = (vm.ssh_info && vm.ssh_info[:host]) if hostname = (vm.ssh_info && vm.ssh_info[:host])
`host #{hostname}`.split("\n").last[/(\d+\.\d+\.\d+\.\d+)/, 1] `host #{hostname}`.split("\n").last[/(\d+\.\d+\.\d+\.\d+)/, 1]
end end

12
lib/vagrant-hostmanager/hosts_file.rb
View File

@ -19,7 +19,7 @@ module VagrantPlugins
# download and modify file with Vagrant-managed entries # download and modify file with Vagrant-managed entries
file = @global_env.tmp_path.join("hosts.#{machine.name}") file = @global_env.tmp_path.join("hosts.#{machine.name}")
machine.communicate.download(realhostfile, file) machine.communicate.download(realhostfile, file)
update_file(machine, file) update_file(file, machine)
# upload modified file and remove temporary file # upload modified file and remove temporary file
machine.communicate.upload(file, '/tmp/hosts') machine.communicate.upload(file, '/tmp/hosts')
@ -49,13 +49,13 @@ module VagrantPlugins
end end
FileUtils.cp(hosts_location, file) FileUtils.cp(hosts_location, file)
update_file(nil, file) update_file(file)
copy_proc.call copy_proc.call
end end
private private
def update_file(current_machine, file) def update_file(file, resolving_machine=nil)
# build array of host file entries from Vagrant configuration # build array of host file entries from Vagrant configuration
entries = [] entries = []
destroyed_entries = [] destroyed_entries = []
@ -65,7 +65,7 @@ module VagrantPlugins
machine = @global_env.machine(name, p) machine = @global_env.machine(name, p)
host = machine.config.vm.hostname || name host = machine.config.vm.hostname || name
id = machine.id id = machine.id
ip = get_ip_address(current_machine, machine) ip = get_ip_address(machine, resolving_machine)
aliases = machine.config.hostmanager.aliases.join(' ').chomp aliases = machine.config.hostmanager.aliases.join(' ').chomp
if id.nil? if id.nil?
destroyed_entries << "#{ip}\t#{host} #{aliases}" destroyed_entries << "#{ip}\t#{host} #{aliases}"
@ -94,10 +94,10 @@ module VagrantPlugins
end end
end end
def get_ip_address(current_machine, machine) def get_ip_address(machine, resolving_machine)
custom_ip_resolver = machine.config.hostmanager.ip_resolver custom_ip_resolver = machine.config.hostmanager.ip_resolver
if custom_ip_resolver if custom_ip_resolver
custom_ip_resolver.call(current_machine, machine) custom_ip_resolver.call(machine, resolving_machine)
else else
ip = nil ip = nil
if machine.config.hostmanager.ignore_private_ip != true if machine.config.hostmanager.ignore_private_ip != true