From ccd735466524e5cdea353714e06d9a3c88d17bdc Mon Sep 17 00:00:00 2001 From: William Kral Date: Sat, 11 Jul 2015 10:31:19 -0700 Subject: [PATCH 1/2] Initialize the install_command salt config var --- plugins/provisioners/salt/config.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/provisioners/salt/config.rb b/plugins/provisioners/salt/config.rb index 638a07bfb..253e7e8bf 100644 --- a/plugins/provisioners/salt/config.rb +++ b/plugins/provisioners/salt/config.rb @@ -33,6 +33,7 @@ module VagrantPlugins attr_accessor :install_args attr_accessor :install_master attr_accessor :install_syndic + attr_accessor :install_command attr_accessor :no_minion attr_accessor :bootstrap_options attr_accessor :version @@ -59,6 +60,7 @@ module VagrantPlugins @install_args = UNSET_VALUE @install_master = UNSET_VALUE @install_syndic = UNSET_VALUE + @install_command = UNSET_VALUE @no_minion = UNSET_VALUE @bootstrap_options = UNSET_VALUE @config_dir = UNSET_VALUE @@ -89,6 +91,7 @@ module VagrantPlugins @install_args = nil if @install_args == UNSET_VALUE @install_master = nil if @install_master == 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 @bootstrap_options = nil if @bootstrap_options == UNSET_VALUE @config_dir = nil if @config_dir == UNSET_VALUE From 27d751863673435693b775bf44e79b9f688a8968 Mon Sep 17 00:00:00 2001 From: William Kral Date: Sat, 11 Jul 2015 10:40:17 -0700 Subject: [PATCH 2/2] Fix alignment of initializer --- plugins/provisioners/salt/config.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/provisioners/salt/config.rb b/plugins/provisioners/salt/config.rb index 253e7e8bf..fb82b6ec3 100644 --- a/plugins/provisioners/salt/config.rb +++ b/plugins/provisioners/salt/config.rb @@ -91,7 +91,7 @@ module VagrantPlugins @install_args = nil if @install_args == UNSET_VALUE @install_master = nil if @install_master == UNSET_VALUE @install_syndic = nil if @install_syndic == UNSET_VALUE - @install_command = nil if @install_command == UNSET_VALUE + @install_command = nil if @install_command == UNSET_VALUE @no_minion = nil if @no_minion == UNSET_VALUE @bootstrap_options = nil if @bootstrap_options == UNSET_VALUE @config_dir = nil if @config_dir == UNSET_VALUE