Fix puppet inheritence for config [GH-722]

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)
 

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.