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

Merge pull request #1067 from jtimberman/chef-command-args 

Add config.arguments for Chef
This commit is contained in:
Mitchell Hashimoto 2012-09-27 13:53:29 -07:00
parent 32d5599e72 50e9f83970
commit 88277fa2e0
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/provisioners/chef/provisioner/base.rb
View File

@ -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

3
plugins/provisioners/chef/provisioner/chef_client.rb
View File

@ -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

3
plugins/provisioners/chef/provisioner/chef_solo.rb
View File

@ -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