From 8a45485de4f1c8158f07168b4f491ee38d22c8fc Mon Sep 17 00:00:00 2001 From: schauer Date: Wed, 9 Jul 2014 21:37:55 +0200 Subject: [PATCH] Update puppet.rb The main manifest may be a single file or a directory of .pp files. docs.puppetlabs.com/puppet/latest/reference/dirs_manifest.html#with-puppet-master https://github.com/mitchellh/vagrant/issues/4039 --- plugins/provisioners/puppet/config/puppet.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/provisioners/puppet/config/puppet.rb b/plugins/provisioners/puppet/config/puppet.rb index 2bd0d097f..3117f9f6f 100644 --- a/plugins/provisioners/puppet/config/puppet.rb +++ b/plugins/provisioners/puppet/config/puppet.rb @@ -105,7 +105,7 @@ module VagrantPlugins path: expanded_path.to_s) else 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", manifest: expanded_manifest_file.to_s) end