From 194d7d11cd974ce51171bfa74cf5b713a0ece12b Mon Sep 17 00:00:00 2001 From: Marc Meszaros Date: Fri, 27 Dec 2013 22:37:54 -0500 Subject: [PATCH] Add error messages to localization file for salt provisioner --- plugins/provisioners/salt/config.rb | 6 +++--- templates/locales/en.yml | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/plugins/provisioners/salt/config.rb b/plugins/provisioners/salt/config.rb index 3861d9f88..044a8c1cc 100644 --- a/plugins/provisioners/salt/config.rb +++ b/plugins/provisioners/salt/config.rb @@ -91,15 +91,15 @@ module VagrantPlugins if @master_key && @master_pub if !@minion_key && !@minion_pub - errors << I18n.t("salt.missing_key") + errors << I18n.t("vagrant.provisioners.salt.missing_key") end end if @install_master && !@no_minion && !@seed_master && @run_highstate - errors << I18n.t("salt.must_accept_keys") + errors << I18n.t("vagrant.provisioners.salt.must_accept_keys") end - return {"salt" => errors} + return {"salt provisioner" => errors} end diff --git a/templates/locales/en.yml b/templates/locales/en.yml index fddfd91a4..0b1e4796f 100644 --- a/templates/locales/en.yml +++ b/templates/locales/en.yml @@ -1377,3 +1377,9 @@ en: docker: not_running: "Docker is not running on the guest VM." install_failed: "Docker installation failed." + + salt: + missing_key: |- + You must include both public and private keys. + must_accept_keys: |- + You must accept keys when running highstate with master!