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

provisioners/puppet: fix some bonehead mistakes

This commit is contained in:
Mitchell Hashimoto 2013-11-25 22:46:10 -08:00
parent 25a8491465
commit 9dfac9557b
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,10 +69,11 @@ module VagrantPlugins
# Manifests path/file validation
if manifests_path[0].to_sym == :host
expanded_path = File.expand_path(manifests_path[1], machine.env.root_path)
if expanded_path.directory?
expanded_path = Pathname.new(manifests_path[1]).
expand_path(machine.env.root_path)
if !expanded_path.directory?
errors << I18n.t("vagrant.provisioners.puppet.manifests_path_missing",
:path => this_expanded_manifests_path)
:path => expanded_path.to_s)
else
expanded_manifest_file = expanded_path.join(manifest_file)
if !expanded_manifest_file.file?

5
plugins/provisioners/puppet/provisioner/puppet.rb
View File

@ -45,7 +45,10 @@ module VagrantPlugins
def provision
# Check that the shared folders are properly shared
check = [manifests_guest_path]
check = []
if @config.manifests_path[0] == :host
check << manifests_guest_path
end
@module_paths.each do |host_path, guest_path|
check << guest_path
end