From 43a9f0928a7e2d246e6f0d9190f6418f765a8bbd Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Wed, 11 Jan 2012 09:57:07 -0800 Subject: [PATCH] Update CHANGELOG --- CHANGELOG.md | 2 ++ lib/vagrant/provisioners/puppet.rb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c337165b..1124d615e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,8 @@ logging is silent. - `system` renamed to `guest` throughout the source. Any `config.vm.system` configurations must be changed to `config.vm.guest` + - Puppet provisioner no longer defaults manifest to "box.pp." Instead, it + is now "default.pp" - All Vagrant commands that take a VM name in a Multi-VM environment can now be given a regular expression. If the name starts and ends with a "/" then it is assumed to be a regular expression. [GH-573] diff --git a/lib/vagrant/provisioners/puppet.rb b/lib/vagrant/provisioners/puppet.rb index 0d5266b46..5ec7fb33a 100644 --- a/lib/vagrant/provisioners/puppet.rb +++ b/lib/vagrant/provisioners/puppet.rb @@ -82,7 +82,7 @@ module Vagrant # Calculate the paths we're going to use based on the environment @expanded_manifests_path = config.expanded_manifests_path(env[:root_path]) @expanded_module_paths = config.expanded_module_paths(env[:root_path]) - @manifest_file = @expanded_manifests_path.join(config.manifest_file) + @manifest_file = File.join(manifests_guest_path, config.manifest_file) set_module_paths share_manifests