From 59d257f832263a3b82b3f84cab240d16eb24a800 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Mon, 3 Feb 2014 22:27:23 +0100
Subject: [PATCH] provisioners/puppet: mergeable config

---
 plugins/provisioners/puppet/config/puppet.rb        | 6 ++++++
 plugins/provisioners/puppet/config/puppet_server.rb | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/plugins/provisioners/puppet/config/puppet.rb b/plugins/provisioners/puppet/config/puppet.rb
index d6e489a86..e7c9dda70 100644
--- a/plugins/provisioners/puppet/config/puppet.rb
+++ b/plugins/provisioners/puppet/config/puppet.rb
@@ -42,6 +42,12 @@ module VagrantPlugins
           end
         end
 
+        def merge(other)
+          super.tap do |result|
+            result.facter  = @facter.merge(other.facter)
+          end
+        end
+
         def finalize!
           super
 
diff --git a/plugins/provisioners/puppet/config/puppet_server.rb b/plugins/provisioners/puppet/config/puppet_server.rb
index 1ca1f8da3..9c53672d5 100644
--- a/plugins/provisioners/puppet/config/puppet_server.rb
+++ b/plugins/provisioners/puppet/config/puppet_server.rb
@@ -20,6 +20,12 @@ module VagrantPlugins
           @puppet_server           = UNSET_VALUE
         end
 
+        def merge(other)
+          super.tap do |result|
+            result.facter  = @facter.merge(other.facter)
+          end
+        end
+
         def finalize!
           super