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

Make config.vm.disks accessible instead of internal

This commit is contained in:
Brian Cain 2019-10-23 15:31:24 -07:00
parent 8adffc830a
commit a55e3d2b91
No known key found for this signature in database
GPG Key ID: 9FC4639B2E4510A0
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/kernel_v2/config/vm.rb
View File

@ -44,6 +44,7 @@ module VagrantPlugins
attr_accessor :post_up_message attr_accessor :post_up_message
attr_accessor :usable_port_range attr_accessor :usable_port_range
attr_reader :provisioners attr_reader :provisioners
attr_reader :disks
# This is an experimental feature that isn't public yet. # This is an experimental feature that isn't public yet.
attr_accessor :clone attr_accessor :clone
@ -74,13 +75,13 @@ module VagrantPlugins
@hostname = UNSET_VALUE @hostname = UNSET_VALUE
@post_up_message = UNSET_VALUE @post_up_message = UNSET_VALUE
@provisioners = [] @provisioners = []
@disks = []
@usable_port_range = UNSET_VALUE @usable_port_range = UNSET_VALUE
# Internal state # Internal state
@__compiled_provider_configs = {} @__compiled_provider_configs = {}
@__defined_vm_keys = [] @__defined_vm_keys = []
@__defined_vms = {} @__defined_vms = {}
@__disks = []
@__finalized = false @__finalized = false
@__networks = {} @__networks = {}
@__providers = {} @__providers = {}
@ -126,9 +127,9 @@ module VagrantPlugins
end end
# Merge defined disks # Merge defined disks
other_disks = other.instance_variable_get(:@__disks) other_disks = other.instance_variable_get(:@disks)
new_disks = @__disks.dup new_disks = @disks.dup
@__disks.each do |d| @disks.each do |d|
other_d = other_disks.find { |o| d.id == o.id } other_d = other_disks.find { |o| d.id == o.id }
if other_d if other_d
# There is an override. Take it. # There is an override. Take it.
@ -204,7 +205,7 @@ module VagrantPlugins
result.instance_variable_set(:@__defined_vm_keys, new_defined_vm_keys) result.instance_variable_set(:@__defined_vm_keys, new_defined_vm_keys)
result.instance_variable_set(:@__defined_vms, new_defined_vms) result.instance_variable_set(:@__defined_vms, new_defined_vms)
result.instance_variable_set(:@__disks, new_disks) result.instance_variable_set(:@disks, new_disks)
result.instance_variable_set(:@__providers, new_providers) result.instance_variable_set(:@__providers, new_providers)
result.instance_variable_set(:@__provider_order, new_order) result.instance_variable_set(:@__provider_order, new_order)
result.instance_variable_set(:@__provider_overrides, new_overrides) result.instance_variable_set(:@__provider_overrides, new_overrides)
@ -416,7 +417,7 @@ module VagrantPlugins
# Add provider config # Add provider config
disk.add_config(options, &block) disk.add_config(options, &block)
@__disks << disk @disks << disk
end end
#------------------------------------------------------------------- #-------------------------------------------------------------------
@ -582,7 +583,7 @@ module VagrantPlugins
end end
end end
@__disks.each do |d| @disks.each do |d|
d.finalize! d.finalize!
end end
@ -789,13 +790,13 @@ module VagrantPlugins
# Validate disks # Validate disks
# Check if there is more than one primrary disk defined and throw an error # Check if there is more than one primrary disk defined and throw an error
if @__disks.select { |d| d.primary && d.type == :disk }.size > 1 if @disks.select { |d| d.primary && d.type == :disk }.size > 1
errors << "There is more than one disk defined for guest '#{machine.name}'. Please pick a `primary` disk." errors << "There is more than one disk defined for guest '#{machine.name}'. Please pick a `primary` disk."
end end
# TODO: Check for duplicate disk names? # TODO: Check for duplicate disk names?
@__disks.each do |d| @disks.each do |d|
error = d.validate(machine) error = d.validate(machine)
errors.concat error if !error.empty? errors.concat error if !error.empty?
end end