need_configure should return true when master_config is defined as well.

This fixes #2204 and fixes saltstack/salty-vagrant#100
2013-09-14 09:46:08 -05:00 · 2013-09-14 09:46:08 -05:00 · 624a9dd2fd
parent 7b440339f3
commit 624a9dd2fd
1 changed files with 1 additions and 1 deletions
--- 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