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

Merge pull request #3126 from bbinet/fix-salt-provisioning 

provisioners/salt: allow master key with no minion key
This commit is contained in:
Mitchell Hashimoto 2014-03-11 09:05:50 -07:00
parent 5a3a501455 9625957203
commit 24d8067c7b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,12 +92,12 @@ module VagrantPlugins
if @minion_key || @minion_pub if @minion_key || @minion_pub
if !@minion_key || !@minion_pub if !@minion_key || !@minion_pub
errors << @minion_pub errors << I18n.t("vagrant.provisioners.salt.missing_key")
end end
end end
if @master_key && @master_pub if @master_key || @master_pub
if !@minion_key && !@minion_pub if !@master_key || !@master_pub
errors << I18n.t("vagrant.provisioners.salt.missing_key") errors << I18n.t("vagrant.provisioners.salt.missing_key")
end end
end end