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

Include before/after options in final provision hash

This commit is contained in:
Brian Cain 2019-08-20 11:31:00 -07:00
parent 6db03f2aed
commit 6777493c46
No known key found for this signature in database
GPG Key ID: 9FC4639B2E4510A0
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/vagrant/action/builtin/mixin_provisioners.rb
View File

@ -29,6 +29,8 @@ module Vagrant
options = { options = {
name: provisioner.name, name: provisioner.name,
run: provisioner.run, run: provisioner.run,
before: provisioner.before,
after: provisioner.after,
} }
# Return the result # Return the result
@ -38,6 +40,13 @@ module Vagrant
return @_provisioner_instances.compact return @_provisioner_instances.compact
end end
# Sorts provisioners based on order specified with before/after options
#
# @return [Array<Provisioner, Hash>]
def sort_provisioner_instances(pvs)
return pvs
end
# This will return a mapping of a provisioner instance to its # This will return a mapping of a provisioner instance to its
# type. # type.
def provisioner_type_map(env) def provisioner_type_map(env)

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

@ -105,6 +105,8 @@ module VagrantPlugins
@config.finalize! @config.finalize!
end end
# Validates the before/after options
#
# @param [Vagrant::Machine] machine - machine to validate against # @param [Vagrant::Machine] machine - machine to validate against
# @param [Array<Symbol>] provisioner_names - Names of provisioners for a given machine # @param [Array<Symbol>] provisioner_names - Names of provisioners for a given machine
# @return [Array] array of strings of error messages from config option validation # @return [Array] array of strings of error messages from config option validation