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

Move default chef solo configuration to the chef solo provisioner

This commit is contained in:
Mitchell Hashimoto 2010-03-10 14:58:41 -08:00
parent 86ffbe5d32
commit 2763540b44
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/default.rb
View File

@ -16,14 +16,8 @@ Vagrant::Config.run do |config|
config.vm.project_directory = "/vagrant" config.vm.project_directory = "/vagrant"
config.vm.forward_port("ssh", 22, 2222) config.vm.forward_port("ssh", 22, 2222)
config.vm.disk_image_format = 'VMDK' config.vm.disk_image_format = 'VMDK'
config.vm.provisioner = nil
config.package.name = 'vagrant' config.package.name = 'vagrant'
config.package.extension = '.box' config.package.extension = '.box'
config.chef_solo.cookbooks_path = "cookbooks"
config.chef_solo.provisioning_path = "/tmp/vagrant-chef"
config.chef_solo.json = {
:instance_role => "vagrant",
:recipes => ["vagrant_main"]
}
end end

9
lib/vagrant/provisioners/chef_solo.rb
View File

@ -8,6 +8,15 @@ module Vagrant
attr_accessor :provisioning_path attr_accessor :provisioning_path
attr_accessor :json attr_accessor :json
def initialize
@cookbooks_path = "cookbooks"
@provisioning_path = "/tmp/vagrant-chef"
@json = {
:instance_role => "vagrant",
:recipes => ["vagrant_main"]
}
end
def to_json def to_json
# Overridden so that the 'json' key could be removed, since its just # Overridden so that the 'json' key could be removed, since its just
# merged into the config anyways # merged into the config anyways