core: provision-with works with provisioner IDs [GH-2850]
This commit is contained in:
parent
aa981cf4ec
commit
9d8c85e966
|
@ -27,6 +27,7 @@ module Vagrant
|
|||
|
||||
# Build up the options
|
||||
options = {
|
||||
id: provisioner.id,
|
||||
run: provisioner.run,
|
||||
}
|
||||
|
||||
|
|
|
@ -103,7 +103,8 @@ module Vagrant
|
|||
provisioner_instances(env).each do |p, options|
|
||||
type_name = type_map[p]
|
||||
next if env[:provision_types] && \
|
||||
!env[:provision_types].include?(type_name)
|
||||
!env[:provision_types].include?(type_name) && \
|
||||
!env[:provision_types].include?(options[:id]) &&
|
||||
|
||||
# Don't run if sentinel is around and we're not always running
|
||||
next if !provision_enabled && options[:run] != :always
|
||||
|
|
Loading…
Reference in New Issue