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

Attempt to validate top scope provisioner options

This commit is contained in:
Brian Cain 2019-08-06 16:18:58 -07:00
parent e05437ddf2
commit 28c0f6085c
No known key found for this signature in database
GPG Key ID: 9FC4639B2E4510A0
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -760,6 +760,13 @@ module VagrantPlugins
next next
end end
require 'pry'
binding.pry
#provisioner_errors = vm_provisioner.validate(machine)
#if provisioner_errors
# errors = Vagrant::Config::V2::Util.merge_errors(errors, provisioner_errors)
#end
if vm_provisioner.config if vm_provisioner.config
provisioner_errors = vm_provisioner.config.validate(machine) provisioner_errors = vm_provisioner.config.validate(machine)
if provisioner_errors if provisioner_errors

8
plugins/kernel_v2/config/vm_provisioner.rb
View File

@ -3,7 +3,7 @@ require 'log4r'
module VagrantPlugins module VagrantPlugins
module Kernel_V2 module Kernel_V2
# Represents a single configured provisioner for a VM. # Represents a single configured provisioner for a VM.
class VagrantConfigProvisioner class VagrantConfigProvisioner < Vagrant.plugin("2", :config)
# Defaults # Defaults
VALID_BEFORE_AFTER_TYPES = [:each, :all].freeze VALID_BEFORE_AFTER_TYPES = [:each, :all].freeze
@ -53,7 +53,7 @@ module VagrantPlugins
# @return [String] # @return [String]
attr_accessor :after attr_accessor :after
def initialize(name, type) def initialize(name, type, before=nil, after=nil)
@logger = Log4r::Logger.new("vagrant::config::vm::provisioner") @logger = Log4r::Logger.new("vagrant::config::vm::provisioner")
@logger.debug("Provisioner defined: #{name}") @logger.debug("Provisioner defined: #{name}")
@ -64,8 +64,8 @@ module VagrantPlugins
@preserve_order = false @preserve_order = false
@run = nil @run = nil
@type = type @type = type
@before = nil @before = before #these aren't being properly set
@after = nil @after = after
# Attempt to find the provisioner... # Attempt to find the provisioner...
if !Vagrant.plugin("2").manager.provisioners[type] if !Vagrant.plugin("2").manager.provisioners[type]