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

Update puppet provisioner config to latest validation API

This commit is contained in:
Mitchell Hashimoto 2013-01-18 13:08:38 -08:00
parent 5e42a99ab6
commit df32c47780
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,29 +35,34 @@ module VagrantPlugins
end end
end end
def validate(env, errors) def validate(machine)
errors = []
# Calculate the manifests and module paths based on env # Calculate the manifests and module paths based on env
this_expanded_manifests_path = expanded_manifests_path(env.root_path) this_expanded_manifests_path = expanded_manifests_path(machine.env.root_path)
this_expanded_module_paths = expanded_module_paths(env.root_path) this_expanded_module_paths = expanded_module_paths(machine.env.root_path)
# Manifests path/file validation # Manifests path/file validation
if !this_expanded_manifests_path.directory? if !this_expanded_manifests_path.directory?
errors.add(I18n.t("vagrant.provisioners.puppet.manifests_path_missing", errors << I18n.t("vagrant.provisioners.puppet.manifests_path_missing",
:path => this_expanded_manifests_path)) :path => this_expanded_manifests_path)
else else
expanded_manifest_file = this_expanded_manifests_path.join(manifest_file) expanded_manifest_file = this_expanded_manifests_path.join(manifest_file)
if !expanded_manifest_file.file? if !expanded_manifest_file.file?
errors.add(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
end end
# Module paths validation # Module paths validation
this_expanded_module_paths.each do |path| this_expanded_module_paths.each do |path|
if !path.directory? if !path.directory?
errors.add(I18n.t("vagrant.provisioners.puppet.module_path_missing", :path => path)) errors << I18n.t("vagrant.provisioners.puppet.module_path_missing",
:path => path)
end end
end end
{ "puppet provisioner" => errors }
end end
end end
end end