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

Merge remote branch 'remotes/upstream/master'

This commit is contained in:
Michael Bearne 2011-01-15 09:48:42 +00:00
parent f757184c06 41d2a78cdb
commit 1a317243d7
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
templates/commands/init/Vagrantfile.erb
View File

@ -24,18 +24,19 @@ Vagrant::Config.run do |config|
# Share an additional folder to the guest VM. The first argument is
# an identifier, the second is the path on the guest to mount the
# folder, and the third is the path on the host to the actual folder.
# config.vm.share_folder("v-data", "/vagrant_data", "../data")
# config.vm.share_folder "v-data", "/vagrant_data", "../data"
# Enable provisioning with chef solo, specifying a cookbooks path (relative
# to this Vagrantfile), and adding some recipes and/or roles.
#
# config.vm.provisioner = :chef_solo
# config.chef.cookbooks_path = "cookbooks"
# config.chef.add_recipe "mysql"
# config.chef.add_role "web"
# config.vm.provision :chef_solo do |chef|
# chef.cookbooks_path = "cookbooks"
# chef.add_recipe "mysql"
# chef.add_role "web"
#
# You may also specify custom JSON attributes:
# config.chef.json = { :mysql_password => "foo" }
# # You may also specify custom JSON attributes:
# chef.json = { :mysql_password => "foo" }
# end
# Enable provisioning with chef server, specifying the chef server URL,
# and the path to the validation key (relative to this Vagrantfile).
@ -47,9 +48,10 @@ Vagrant::Config.run do |config|
# HTTP instead of HTTPS depending on your configuration. Also change the
# validation key to validation.pem.
#
# config.vm.provisioner = :chef_server
# config.chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME"
# config.chef.validation_key_path = "ORGNAME-validator.pem"
# config.vm.provision :chef_server do |chef|
# chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME"
# chef.validation_key_path = "ORGNAME-validator.pem"
# end
#
# If you're using the Opscode platform, your validator client is
# ORGNAME-validator, replacing ORGNAME with your organization name.
@ -57,5 +59,5 @@ Vagrant::Config.run do |config|
# IF you have your own Chef Server, the default validation client name is
# chef-validator, unless you changed the configuration.
#
# config.chef.validation_client_name = "ORGNAME-validator"
# chef.validation_client_name = "ORGNAME-validator"
end