diff --git a/plugins/provisioners/chef/provisioner/base.rb b/plugins/provisioners/chef/provisioner/base.rb index 14e81235f..57699d8a8 100644 --- a/plugins/provisioners/chef/provisioner/base.rb +++ b/plugins/provisioners/chef/provisioner/base.rb @@ -101,6 +101,7 @@ module VagrantPlugins attr_accessor :binary_path attr_accessor :binary_env attr_accessor :attempts + attr_accessor :arguments attr_writer :run_list # Provide defaults in such a way that they won't override the instance diff --git a/plugins/provisioners/chef/provisioner/chef_client.rb b/plugins/provisioners/chef/provisioner/chef_client.rb index aa1e8faae..b797e63bd 100644 --- a/plugins/provisioners/chef/provisioner/chef_client.rb +++ b/plugins/provisioners/chef/provisioner/chef_client.rb @@ -91,7 +91,8 @@ module VagrantPlugins def run_chef_client command_env = config.binary_env ? "#{config.binary_env} " : "" - command = "#{command_env}#{chef_binary_path("chef-client")} -c #{config.provisioning_path}/client.rb -j #{config.provisioning_path}/dna.json" + command_args = config.arguments ? " #{config.arguments}" : "" + command = "#{command_env}#{chef_binary_path("chef-client")} -c #{config.provisioning_path}/client.rb -j #{config.provisioning_path}/dna.json #{command_args}" config.attempts.times do |attempt| if attempt == 0 diff --git a/plugins/provisioners/chef/provisioner/chef_solo.rb b/plugins/provisioners/chef/provisioner/chef_solo.rb index 33a21aa6e..fbd640539 100644 --- a/plugins/provisioners/chef/provisioner/chef_solo.rb +++ b/plugins/provisioners/chef/provisioner/chef_solo.rb @@ -186,7 +186,8 @@ module VagrantPlugins def run_chef_solo command_env = config.binary_env ? "#{config.binary_env} " : "" - command = "#{command_env}#{chef_binary_path("chef-solo")} -c #{config.provisioning_path}/solo.rb -j #{config.provisioning_path}/dna.json" + command_args = config.arguments ? " #{config.arguments}" : "" + command = "#{command_env}#{chef_binary_path("chef-solo")} -c #{config.provisioning_path}/solo.rb -j #{config.provisioning_path}/dna.json #{command_args}" config.attempts.times do |attempt| if attempt == 0