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

Merge pull request #5637 from paul-krohn/config-not-found-error 

Provide path to missing file.
This commit is contained in:
Seth Vargo 2015-05-30 11:55:25 -07:00
parent c8733ac44a c7f32e6159
commit dadee77730
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/provisioners/salt/config.rb
View File

@ -114,14 +114,14 @@ module VagrantPlugins
if @minion_config if @minion_config
expanded = Pathname.new(@minion_config).expand_path(machine.env.root_path) expanded = Pathname.new(@minion_config).expand_path(machine.env.root_path)
if !expanded.file? if !expanded.file?
errors << I18n.t("vagrant.provisioners.salt.minion_config_nonexist") errors << I18n.t("vagrant.provisioners.salt.minion_config_nonexist", missing_config_file: expanded)
end end
end end
if @master_config if @master_config
expanded = Pathname.new(@master_config).expand_path(machine.env.root_path) expanded = Pathname.new(@master_config).expand_path(machine.env.root_path)
if !expanded.file? if !expanded.file?
errors << I18n.t("vagrant.provisioners.salt.master_config_nonexist") errors << I18n.t("vagrant.provisioners.salt.master_config_nonexist", missing_config_file: expanded)
end end
end end

4
templates/locales/en.yml
View File

@ -1908,9 +1908,9 @@ en:
salt: salt:
minion_config_nonexist: |- minion_config_nonexist: |-
The specified minion_config file could not be found. The specified minion_config '%{missing_config_file}' file could not be found.
master_config_nonexist: |- master_config_nonexist: |-
The specified master_config file could not be found. The specified master_config '%{missing_config_file}' file could not be found.
grains_config_nonexist: |- grains_config_nonexist: |-
The specified grains_config file could not be found. The specified grains_config file could not be found.
missing_key: |- missing_key: |-