From 96259572039f095efc89f13d62550ce8351a378e Mon Sep 17 00:00:00 2001 From: Bruno Binet Date: Wed, 8 Jan 2014 18:11:11 +0100 Subject: [PATCH] Fix salt provisioning validation (mismatch between minion/master) --- plugins/provisioners/salt/config.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/provisioners/salt/config.rb b/plugins/provisioners/salt/config.rb index f91617224..bf27720f9 100644 --- a/plugins/provisioners/salt/config.rb +++ b/plugins/provisioners/salt/config.rb @@ -92,12 +92,12 @@ module VagrantPlugins if @minion_key || @minion_pub if !@minion_key || !@minion_pub - errors << @minion_pub + errors << I18n.t("vagrant.provisioners.salt.missing_key") end end - if @master_key && @master_pub - if !@minion_key && !@minion_pub + if @master_key || @master_pub + if !@master_key || !@master_pub errors << I18n.t("vagrant.provisioners.salt.missing_key") end end