haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix puppet inheritence for config [GH-722]

This commit is contained in:
Mitchell Hashimoto 2012-02-08 22:28:01 -08:00
parent 5e2d141d47
commit f81fb58cd9
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -10,6 +10,7 @@
depend on this (but I don't see any reason why they would). depend on this (but I don't see any reason why they would).
- `vagrant destroy` now asks for confirmation by default. This can be - `vagrant destroy` now asks for confirmation by default. This can be
overridden with the `--force` flag. [GH-699] overridden with the `--force` flag. [GH-699]
- Fix issue with Puppet config inheritance. [GH-722]
## 0.9.6 (February 7, 2012) ## 0.9.6 (February 7, 2012)

10
lib/vagrant/provisioners/puppet.rb
View File

@ -14,12 +14,10 @@ module Vagrant
attr_accessor :pp_path attr_accessor :pp_path
attr_accessor :options attr_accessor :options
def initialize def manifest_file; @manifest_file || "default.pp"; end
@manifest_file = "default.pp" def manifests_path; @manifests_path || "manifests"; end
@manifests_path = "manifests" def pp_path; @pp_path || "/tmp/vagrant-puppet"; end
@pp_path = "/tmp/vagrant-puppet" def options; @options ||= []; end
@options = []
end
# Returns the manifests path expanded relative to the root path of the # Returns the manifests path expanded relative to the root path of the
# environment. # environment.