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

Merge pull request #4169 from schauer/patch-1 

provisioners/puppet: manifest file can be a dir too
This commit is contained in:
Mitchell Hashimoto 2014-08-06 09:56:24 -07:00
parent 3b2e3b6a69 8a45485de4
commit e1ea304884
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/provisioners/puppet/config/puppet.rb
View File

@ -105,7 +105,7 @@ module VagrantPlugins
path: expanded_path.to_s) path: expanded_path.to_s)
else else
expanded_manifest_file = expanded_path.join(manifest_file) expanded_manifest_file = expanded_path.join(manifest_file)
if !expanded_manifest_file.file? if !expanded_manifest_file.file? && !expanded_manifest_file.directory?
errors << I18n.t("vagrant.provisioners.puppet.manifest_missing", errors << I18n.t("vagrant.provisioners.puppet.manifest_missing",
manifest: expanded_manifest_file.to_s) manifest: expanded_manifest_file.to_s)
end end