From 624a9dd2fd556bc2062e8f63878a406e1e46456a Mon Sep 17 00:00:00 2001 From: Jurnell Cockhren Date: Sat, 14 Sep 2013 09:46:08 -0500 Subject: [PATCH] need_configure should return true when master_config is defined as well. This fixes #2204 and fixes saltstack/salty-vagrant#100 --- plugins/provisioners/salt/provisioner.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/provisioners/salt/provisioner.rb b/plugins/provisioners/salt/provisioner.rb index 73ea3952b..433f94d97 100644 --- a/plugins/provisioners/salt/provisioner.rb +++ b/plugins/provisioners/salt/provisioner.rb @@ -59,7 +59,7 @@ module VagrantPlugins end def need_configure - @config.minion_config or @config.minion_key + @config.minion_config or @config.minion_key or @config.master_config or @config.master_key end def need_install