Commit Graph

7679 Commits

Author SHA1 Message Date
Seth Vargo 5323a51126 Use color 2015-07-09 17:24:29 -06:00
Seth Vargo b191c302f1 Use bundle exec 2015-07-09 17:20:02 -06:00
Seth Vargo dcd8877b60 Try the container VMs 2015-07-09 17:18:19 -06:00
Seth Vargo 85d2a69f98 Update CHANGELOG 2015-07-09 17:07:15 -06:00
Seth Vargo 60330218fb Merge pull request #5913 from mitchellh/sethvargo/windows_chef_paths
Use windows-specific Chef paths
2015-07-09 17:05:40 -06:00
Seth Vargo e9bcf147f0 Prefix with guest_ 2015-07-09 17:01:36 -06:00
Seth Vargo 06dcd55f57 Fix tests 2015-07-09 16:59:17 -06:00
Gilles Cornu 94e26f45ec Update CHANGELOG
Close #5551
2015-07-10 00:56:12 +02:00
Seth Vargo 0e039159a6 Calculate Chef paths at provision time 2015-07-09 16:55:55 -06:00
Nicholas Randon eb6aa2ac8c Allow Ansible provisioner to run reliably in parallel
The Ansible Vagrant provisioner has a race where the inventory file is
updated every time the provisioner runs unless a file is provided.

Therefore if Ansible attempts to provision two nodes in parallel, you
may see the following race:
   * System A writes the inventory file and calls Ansible.
   * System B starts to provision and truncates the file before
     creating a new one.
   * Ansible on system A now attempts to read the inventory
     file, which is blank. Ansible bombs out with "ERROR: provided
     hosts list is empty".

To fix this, we only allow Vagrant to update the inventory file if
it needs to.
2015-07-10 00:53:59 +02:00
Seth Vargo 04ed8d3d03 Merge pull request #5912 from mitchellh/sethvargo/subprocess_escape
Automatically restore the original environment if we are runnings something outside of the embedded installer
2015-07-09 16:10:33 -06:00
Seth Vargo fafa3fa437 Add another log statement 2015-07-09 16:06:03 -06:00
Seth Vargo 742d47c4cf No longer need subprocess wrapping there :) 2015-07-09 16:06:03 -06:00
Seth Vargo 68ef9676c7 Jailbreak out of the subprocess and restore original environment 2015-07-09 16:06:03 -06:00
Seth Vargo 46563560f4 Update with_clean_env helpers 2015-07-09 16:06:02 -06:00
Seth Vargo 50a64ea30b Add a log statement 2015-07-09 16:06:02 -06:00
Seth Vargo 0a5d37fc8b Reset the original environment if we are running something outside of the installer 2015-07-09 16:06:02 -06:00
Mitchell Hashimoto 790c625bc0 Merge pull request #5884 from dcbw/dcbw/fedora-network-mac-address
[fedora] honor MAC address when configuring networks
2015-07-09 16:01:33 -06:00
Mitchell Hashimoto dd625a9352 update CHANGELOG 2015-07-09 15:18:36 -06:00
Mitchell Hashimoto d36f611e24 Merge branch 'maxlinc-filter_synced_folders' 2015-07-09 15:05:59 -06:00
Mitchell Hashimoto cea44847de Merge branch 'filter_synced_folders' of https://github.com/maxlinc/vagrant into maxlinc-filter_synced_folders 2015-07-09 15:05:52 -06:00
Mitchell Hashimoto d51c5fbc69 Merge pull request #5435 from juiceinc/bugfix/salt-provisioner
Update Salt provisioner to allow more flexibility in passing arguments to the bootstrap script
2015-07-09 15:02:34 -06:00
Mitchell Hashimoto b0b9f67faf Merge pull request #5514 from MiLk/fixes/several-boxes-same-name
Allow to use several boxes with the same name
2015-07-09 15:00:03 -06:00
Mitchell Hashimoto 5fd3ab5bb0 Merge pull request #5706 from jim-minter/master
Remove docker0 from guest network interface enumeration
2015-07-09 14:31:00 -06:00
Mitchell Hashimoto c65c62b2c1 Merge pull request #5880 from strzibny/fix-nfs
Fix: Rewrite Red Hat NFS handling based on systemd
2015-07-09 14:27:30 -06:00
Mitchell Hashimoto b3e935203e remove unuse dline 2015-07-09 14:25:10 -06:00
Mitchell Hashimoto 3cad495064 Merge pull request #5887 from msabramo/config.ssh.ssh_command
Add setting config.ssh.ssh_command
2015-07-09 14:24:48 -06:00
Mitchell Hashimoto 3cd12b418c update CHANGELOG 2015-07-09 14:23:55 -06:00
Mitchell Hashimoto f1618f5ec8 providers/docker: don't remove image on reload for build cache 2015-07-09 14:23:26 -06:00
Mitchell Hashimoto 057f04e46a Merge pull request #5905 from adrianguenter/adrianguenter-5353
Docker Provider: Don't destroy built Docker image on reload
2015-07-09 14:22:43 -06:00
Adrian Guenter 9bdefb5c59 Don't destroy built Docker image on reload 2015-07-09 16:15:56 -04:00
Mitchell Hashimoto e903988461 fix tests 2015-07-09 14:14:30 -06:00
Mitchell Hashimoto e9d8fa5f1c update CHANGELOG 2015-07-09 14:05:30 -06:00
Mitchell Hashimoto 300b9c9109 provisioners/chef: don't check existing set, unique ID
[GH-5199]
2015-07-09 14:04:12 -06:00
Seth Vargo b49d25c56c Update CHANGELOG 2015-07-09 13:20:55 -06:00
Seth Vargo 912a878840 Merge pull request #5910 from mitchellh/sethvargo/preserve_original_env
Add Vagrant.original_env and break out of bundler in subprocess
2015-07-09 13:19:49 -06:00
Seth Vargo e46ef7d2f8 Document debugging the launcher 2015-07-09 13:14:38 -06:00
Seth Vargo 3ba10b43ab Restore the original environment from Bundler and the installer if given 2015-07-09 13:14:34 -06:00
Seth Vargo d8d5a66fa5 Add a function to get to the "original" environment with Vagrant
This function only works when used with the official Vagrant installer.
2015-07-09 12:34:04 -06:00
Mitchell Hashimoto d5458247c7 update to latest listen 2015-07-09 11:18:36 -06:00
Mitchell Hashimoto 05463ebe10 update CHANGELOG 2015-07-09 11:13:17 -06:00
Mitchell Hashimoto 9596b7a46c synced_folders/rsync-auto: don't crash if rsync command fails [GH-4991] 2015-07-09 11:11:58 -06:00
Mitchell Hashimoto 7e61afd480 website/docs: clarify rsync options hash
:: Please enter the commit message for your changes. Lines starting
2015-07-09 11:08:07 -06:00
Mitchell Hashimoto d95dad9a79 synced_folders/rsync: command help [GH-5868] 2015-07-09 10:58:45 -06:00
Mitchell Hashimoto ac8c3fffc8 website/docs: doc options for NFS [GH-5583] 2015-07-09 10:39:33 -06:00
Mitchell Hashimoto 964f340f09 synced_folders/nfs: verify_installed option [GH-5269] 2015-07-09 10:24:40 -06:00
Mitchell Hashimoto 425e9aa6cd update CHANGELOG 2015-07-09 10:03:07 -06:00
Mitchell Hashimoto 31448d126b synced_folders/rsync: can set rsync_path [GH-3966] 2015-07-09 10:02:38 -06:00
Mitchell Hashimoto 26b5b67a6c website: update docs for SMB disconnect [GH-4538] 2015-07-09 09:55:18 -06:00
Mitchell Hashimoto 0440779d8f website: clarify NFS mount options [GH-4858] 2015-07-09 09:51:46 -06:00