diff --git a/CHANGELOG.md b/CHANGELOG.md index 3605f9d3c..0ca66cc4c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ BUG FIXES: - providers/docker: default proxy VM won't use HGFS [GH-3687] - providers/docker: fix container linking [GH-3719] - providers/docker: Port settings expose to host properly. [GH-3723] + - provisioners/puppet: Separate module paths with ';' on Windows. [GH-3731] ## 1.6.1 (May 7, 2014) diff --git a/plugins/provisioners/puppet/provisioner/puppet.rb b/plugins/provisioners/puppet/provisioner/puppet.rb index 7398026d4..79a69c2d6 100644 --- a/plugins/provisioners/puppet/provisioner/puppet.rb +++ b/plugins/provisioners/puppet/provisioner/puppet.rb @@ -113,7 +113,8 @@ module VagrantPlugins module_paths << default_module_path # Add the command line switch to add the module path - options << "--modulepath '#{module_paths.join(':')}'" + module_path_sep = windows? ? ";" : ":" + options << "--modulepath '#{module_paths.join(module_path_sep)}'" end if @hiera_config_path