From 32c45aa70b9291b70bdc8fb71033bfff36857801 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Mon, 24 Feb 2014 08:07:57 -0800 Subject: [PATCH] Revert "Merge pull request #2677 from purpleidea/fix_puppet_apply" This reverts commit 9ac4ec85dd5a3cd4af09430dd5e432b9a5e3da0f, reversing changes made to 8dbad22d728fe9ba35d7dc3c51ac2e8356c4117f. --- plugins/provisioners/puppet/provisioner/puppet.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/provisioners/puppet/provisioner/puppet.rb b/plugins/provisioners/puppet/provisioner/puppet.rb index 53d8640a2..0cb0c9526 100644 --- a/plugins/provisioners/puppet/provisioner/puppet.rb +++ b/plugins/provisioners/puppet/provisioner/puppet.rb @@ -98,6 +98,9 @@ module VagrantPlugins options = [config.options].flatten module_paths = @module_paths.map { |_, to| to } if !@module_paths.empty? + # Prepend the default module path + module_paths.unshift("/etc/puppet/modules") + # Add the command line switch to add the module path options << "--modulepath '#{module_paths.join(':')}'" end