From 529cb21154ecadf1d2b116755df742e9042890b8 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Fri, 15 Mar 2013 15:00:28 -0700 Subject: [PATCH] Don't use full path to manifest with Puppet, exposes bug in VMware --- CHANGELOG.md | 2 ++ plugins/provisioners/puppet/provisioner/puppet.rb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e72155d95..2af337298 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,8 @@ BUG FIXES: - When there is no route to host for SSH, re-establish a new connection. - `vagrant package` once again works, no more nil error. [GH-1423] - Human friendly error when "metadata.json" is missing in a box. + - Don't use the full path to the manifest file with the Puppet provisioner + because it exposes a bug with Puppet path lookup on VMware. ## 1.1.0 (March 14, 2013) diff --git a/plugins/provisioners/puppet/provisioner/puppet.rb b/plugins/provisioners/puppet/provisioner/puppet.rb index 11a794a6b..5133ae318 100644 --- a/plugins/provisioners/puppet/provisioner/puppet.rb +++ b/plugins/provisioners/puppet/provisioner/puppet.rb @@ -19,7 +19,7 @@ module VagrantPlugins root_path = @machine.env.root_path @expanded_manifests_path = @config.expanded_manifests_path(root_path) @expanded_module_paths = @config.expanded_module_paths(root_path) - @manifest_file = File.join(manifests_guest_path, @config.manifest_file) + @manifest_file = @config.manifest_file # Setup the module paths @module_paths = []