Merge pull request #5981 from jkburges/named_provision_with

Allow provisioner instance names to be specified for `up` and `reload…

plugins/commands/reload/command.rb

@@ -30,7 +30,7 @@ module VagrantPlugins
         return if !argv
 
         # Validate the provisioners
-        validate_provisioner_flags!(options)
+        validate_provisioner_flags!(options, argv)
 
         @logger.debug("'reload' each target VM...")
         machines = []

plugins/commands/up/command.rb

@@ -55,7 +55,7 @@ module VagrantPlugins
         return if !argv
 
         # Validate the provisioners
-        validate_provisioner_flags!(options)
+        validate_provisioner_flags!(options, argv)
 
         # Go over each VM and bring it up
         @logger.debug("'Up' each target VM...")

plugins/commands/up/start_mixins.rb

@@ -26,13 +26,22 @@ module VagrantPlugins
 
       # This validates the provisioner flags and raises an exception
       # if there are invalid ones.
-      def validate_provisioner_flags!(options)
+      def validate_provisioner_flags!(options, argv)
-        (options[:provision_types] || []).each do |type|
+        provisioner_instance_names = []
-            klass = Vagrant.plugin("2").manager.provisioners[type]
+        with_target_vms(argv) do |machine|
-            if !klass
+          provisioner_instance_names << machine.config.vm.provisioners.map(&:name)
-              raise Vagrant::Errors::ProvisionerFlagInvalid,
+        end
-                name: type.to_s
+
-            end
+        provisioner_instance_names.flatten!.uniq!
+
+        if (provisioner_instance_names & options[:provision_types]).empty?
+          (options[:provision_types] || []).each do |type|
+              klass = Vagrant.plugin("2").manager.provisioners[type]
+              if !klass
+                raise Vagrant::Errors::ProvisionerFlagInvalid,
+                  name: type.to_s
+              end
+          end
         end
       end
     end