From f81fb58cd96436c81feb2c0ec0d186827a382ac9 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 8 Feb 2012 22:28:01 -0800
Subject: [PATCH] Fix puppet inheritence for config [GH-722]

---
 CHANGELOG.md                       |  1 +
 lib/vagrant/provisioners/puppet.rb | 10 ++++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 557d9a309..87b373f90 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
     depend on this (but I don't see any reason why they would).
   - `vagrant destroy` now asks for confirmation by default. This can be
     overridden with the `--force` flag. [GH-699]
+  - Fix issue with Puppet config inheritance. [GH-722]
 
 ## 0.9.6 (February 7, 2012)
 
diff --git a/lib/vagrant/provisioners/puppet.rb b/lib/vagrant/provisioners/puppet.rb
index a41d28208..e18404b05 100644
--- a/lib/vagrant/provisioners/puppet.rb
+++ b/lib/vagrant/provisioners/puppet.rb
@@ -14,12 +14,10 @@ module Vagrant
         attr_accessor :pp_path
         attr_accessor :options
 
-        def initialize
-          @manifest_file = "default.pp"
-          @manifests_path = "manifests"
-          @pp_path = "/tmp/vagrant-puppet"
-          @options = []
-        end
+        def manifest_file; @manifest_file || "default.pp"; end
+        def manifests_path; @manifests_path || "manifests"; end
+        def pp_path; @pp_path || "/tmp/vagrant-puppet"; end
+        def options; @options ||= []; end
 
         # Returns the manifests path expanded relative to the root path of the
         # environment.