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

Merge pull request #5936 from wkral/fix-salt-bootstrap-install 

Fix salt bootstrap issue after 1.7.3 upgrade with verbose option set
This commit is contained in:
Mitchell Hashimoto 2015-07-13 08:34:01 -07:00
parent bfa829d89b 27d7518636
commit 39baec78e7
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,6 +33,7 @@ module VagrantPlugins
attr_accessor :install_args attr_accessor :install_args
attr_accessor :install_master attr_accessor :install_master
attr_accessor :install_syndic attr_accessor :install_syndic
attr_accessor :install_command
attr_accessor :no_minion attr_accessor :no_minion
attr_accessor :bootstrap_options attr_accessor :bootstrap_options
attr_accessor :version attr_accessor :version
@ -59,6 +60,7 @@ module VagrantPlugins
@install_args = UNSET_VALUE @install_args = UNSET_VALUE
@install_master = UNSET_VALUE @install_master = UNSET_VALUE
@install_syndic = UNSET_VALUE @install_syndic = UNSET_VALUE
@install_command = UNSET_VALUE
@no_minion = UNSET_VALUE @no_minion = UNSET_VALUE
@bootstrap_options = UNSET_VALUE @bootstrap_options = UNSET_VALUE
@config_dir = UNSET_VALUE @config_dir = UNSET_VALUE
@ -89,6 +91,7 @@ module VagrantPlugins
@install_args = nil if @install_args == UNSET_VALUE @install_args = nil if @install_args == UNSET_VALUE
@install_master = nil if @install_master == UNSET_VALUE @install_master = nil if @install_master == UNSET_VALUE
@install_syndic = nil if @install_syndic == UNSET_VALUE @install_syndic = nil if @install_syndic == UNSET_VALUE
@install_command = nil if @install_command == UNSET_VALUE
@no_minion = nil if @no_minion == UNSET_VALUE @no_minion = nil if @no_minion == UNSET_VALUE
@bootstrap_options = nil if @bootstrap_options == UNSET_VALUE @bootstrap_options = nil if @bootstrap_options == UNSET_VALUE
@config_dir = nil if @config_dir == UNSET_VALUE @config_dir = nil if @config_dir == UNSET_VALUE