Reversing cf651497a2 as v1.6.0 has been a success.

This commit is contained in:
Seth Reeser 2015-08-06 10:48:05 -04:00
parent bb53e420ae
commit dcdfcc9262
4 changed files with 2 additions and 24 deletions

View File

@ -59,11 +59,6 @@ up or have a private ip configured will be added to the hosts file.
In addition, the `hostmanager.aliases` configuration attribute can be used In addition, the `hostmanager.aliases` configuration attribute can be used
to provide aliases for your host names. to provide aliases for your host names.
On some systems, long alias lines have been reported to cause issues
(see [#60](https://github.com/smdahlen/vagrant-hostmanager/issues/60)).
In such cases, you may render aliases on separate lines by setting
```hostmanager.aliases_on_separate_lines = true```.
Example configuration: Example configuration:
```ruby ```ruby

View File

@ -7,7 +7,6 @@ module VagrantPlugins
attr_accessor :aliases attr_accessor :aliases
attr_accessor :include_offline attr_accessor :include_offline
attr_accessor :ip_resolver attr_accessor :ip_resolver
attr_accessor :aliases_on_separate_lines
alias_method :enabled?, :enabled alias_method :enabled?, :enabled
alias_method :include_offline?, :include_offline alias_method :include_offline?, :include_offline
@ -20,7 +19,6 @@ module VagrantPlugins
@include_offline = UNSET_VALUE @include_offline = UNSET_VALUE
@aliases = UNSET_VALUE @aliases = UNSET_VALUE
@ip_resolver = UNSET_VALUE @ip_resolver = UNSET_VALUE
@aliases_on_separate_lines = UNSET_VALUE
end end
def finalize! def finalize!
@ -30,7 +28,6 @@ module VagrantPlugins
@include_offline = false if @include_offline == UNSET_VALUE @include_offline = false if @include_offline == UNSET_VALUE
@aliases = [] if @aliases == UNSET_VALUE @aliases = [] if @aliases == UNSET_VALUE
@ip_resolver = nil if @ip_resolver == UNSET_VALUE @ip_resolver = nil if @ip_resolver == UNSET_VALUE
@aliases_on_separate_lines = false if @aliases_on_separate_lines == UNSET_VALUE
@aliases = [ @aliases ].flatten @aliases = [ @aliases ].flatten
end end

View File

@ -92,19 +92,8 @@ module VagrantPlugins
ip = get_ip_address(machine, resolving_machine) ip = get_ip_address(machine, resolving_machine)
host = machine.config.vm.hostname || machine.name host = machine.config.vm.hostname || machine.name
aliases = machine.config.hostmanager.aliases aliases = machine.config.hostmanager.aliases
if ip != nil if ip != nil
# As per GH-60, we optionally render aliases on separate lines "#{ip}\t#{host}\n" + aliases.map{|a| "#{ip}\t#{a}"}.join("\n") + "\n"
current_machine_config = ((resolving_machine && resolving_machine.config) || @config)
if current_machine_config.hostmanager.aliases_on_separate_lines
rendered_aliases = aliases.map { |a| "#{ip}\t#{a}" }.join("\n")
separator = "\n"
else
rendered_aliases = aliases.join(" ")
separator = "\t"
end
"#{ip}\t#{host}" + separator + rendered_aliases + "\n"
end end
end end

5
test/Vagrantfile vendored
View File

@ -16,19 +16,16 @@ Vagrant.configure('2') do |config|
config.hostmanager.enabled = true config.hostmanager.enabled = true
config.hostmanager.manage_host = true config.hostmanager.manage_host = true
# config.hostmanager.aliases_on_separate_lines = true
config.vm.define :server1 do |server| config.vm.define :server1 do |server|
server.vm.hostname = 'fry' server.vm.hostname = 'fry'
server.vm.network :private_network, :ip => '10.0.5.2' server.vm.network :private_network, :ip => '10.0.5.2'
server.hostmanager.aliases = %w(alias1 alias2) server.hostmanager.aliases = %w(test-alias)
end end
config.vm.define :server2 do |server| config.vm.define :server2 do |server|
server.vm.hostname = 'bender' server.vm.hostname = 'bender'
server.vm.network :private_network, :ip => '10.0.5.3' server.vm.network :private_network, :ip => '10.0.5.3'
server.hostmanager.aliases = %w(alias3 alias4)
server.hostmanager.aliases_on_separate_lines = true
end end
config.vm.define :server3 do |server| config.vm.define :server3 do |server|