Merge pull request hashicorp#964 from jbraeuer/puppet-modulepath-fix

Fix problem that Puppet module-paths were re-ordered by Vagrant.

plugins/provisioners/puppet/provisioner/puppet.rb

@@ -118,9 +118,9 @@ def share_module_paths
         end
 
         def set_module_paths
-          @module_paths = {}
+          @module_paths = []
           @expanded_module_paths.each_with_index do |path, i|
-            @module_paths[path] = File.join(config.pp_path, "modules-#{i}")
+            @module_paths << [path, File.join(config.pp_path, "modules-#{i}"]
           end
         end
 
@@ -137,7 +137,8 @@ def verify_binary(binary)
 
         def run_puppet_client
           options = [config.options].flatten
-          options << "--modulepath '#{@module_paths.values.join(':')}'" if !@module_paths.empty?
+          module_paths = @module_paths.map { |_, to| to }
+          options << "--modulepath '#{module_paths.join(':')}'" if !@module_paths.empty?
           options << @manifest_file
           options = options.join(" ")