From c7f32e615986fb54e08f47db39e8b17578728bed Mon Sep 17 00:00:00 2001 From: Paul Krohn Date: Sun, 26 Apr 2015 11:34:34 -0700 Subject: [PATCH] When you can't find the salt minion or master config, say what you were looking for. --- plugins/provisioners/salt/config.rb | 4 ++-- templates/locales/en.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/provisioners/salt/config.rb b/plugins/provisioners/salt/config.rb index 4d97d942c..0aabddf4f 100644 --- a/plugins/provisioners/salt/config.rb +++ b/plugins/provisioners/salt/config.rb @@ -95,14 +95,14 @@ module VagrantPlugins if @minion_config expanded = Pathname.new(@minion_config).expand_path(machine.env.root_path) 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 if @master_config expanded = Pathname.new(@master_config).expand_path(machine.env.root_path) 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 diff --git a/templates/locales/en.yml b/templates/locales/en.yml index f5de5b2c0..92edd0d0a 100644 --- a/templates/locales/en.yml +++ b/templates/locales/en.yml @@ -1908,9 +1908,9 @@ en: salt: 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: |- - The specified master_config file could not be found. + The specified master_config '%{missing_config_file}' file could not be found. grains_config_nonexist: |- The specified grains_config file could not be found. missing_key: |-