From 12c740898c30184200de597a206568ee4441ea47 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Mon, 24 Feb 2014 08:09:24 -0800
Subject: [PATCH] provisioners/puppet: append module path  (default) [GH-2677]

---
 CHANGELOG.md                                      | 2 ++
 plugins/provisioners/puppet/provisioner/puppet.rb | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aca41a61a..4b39e5c17 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -112,6 +112,8 @@ BUG FIXES:
     isn't already in it. [GH-2838]
   - provisioners/docker: Configuring autostart works properly with
     the newest versions of Docker. [GH-2874]
+  - provisioners/puppet: Append default module path to the module paths
+    always. [GH-2677]
   - provisioners/salt: Options can now set install type and install args.
     [GH-2766]
   - provisioners/salt: Fix case when salt would say "options only allowed
diff --git a/plugins/provisioners/puppet/provisioner/puppet.rb b/plugins/provisioners/puppet/provisioner/puppet.rb
index 0cb0c9526..3abe86fd4 100644
--- a/plugins/provisioners/puppet/provisioner/puppet.rb
+++ b/plugins/provisioners/puppet/provisioner/puppet.rb
@@ -98,8 +98,8 @@ 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")
+            # Append the default module path
+            module_paths << "/etc/puppet/modules"
 
             # Add the command line switch to add the module path
             options << "--modulepath '#{module_paths.join(':')}'"