Commit Graph

9208 Commits

Author SHA1 Message Date
Seth Vargo d9936e8808 Merge pull request #7589 from junaruga/feature/support-rest-client-2
Support rest-client 2.x as a dependency
2016-07-15 09:50:45 -06:00
Jun Aruga 75e2d0924a Support rest-client 2.x as a dependency 2016-07-15 13:07:19 +02:00
Alex Vandiver 3d2fde9260 Skip checking for conflicts on ports that are disabled
Currently, the supported way (see GH#1922) to disable the default port
2222 port forward is:

    config.vm.network :forwarded_port, guest: 22, host: 2222, disabled: true

However, the port collision detection runs on all ports, regardless of
the `disabled` flag.  This leads it to attempt to connect to port
2222, notice it is taken, and abort with a port conflict -- even
though it will not be attempting to use the port at all.

Skip disabled ports when doing port conflict detection.

A workaround that does not require a Vagrant upgrade to one containing
this fix is to instead set `auto_correct` on the disabled port:

    config.vm.network :forwarded_port, guest: 22, host: 2222, disabled: true, auto_correct: true

This allows the disabled port to be reshuffled off to some other
unused port.
2016-07-14 19:52:38 -07:00
Seth Vargo 7a898dc7eb
Update CHANGELOG 2016-07-13 09:57:13 -06:00
Seth Vargo ee7126e098 Merge pull request #7574 from Ingramz/master
Add VirtualBox 5.1 driver
2016-07-13 09:56:19 -06:00
Indrek Ardel b57b0e0d48 Add VirtualBox 5.1 driver 2016-07-13 15:34:25 +03:00
Colin Walters 72c1972181 plugin: Write out state file via create-new-then-rename
This makes updates atomic, so it's useful generally.  However
I'm making this change specifically to support rpm-ostree.

For more information, see:
https://bugzilla.redhat.com/show_bug.cgi?id=1352152
2016-07-12 16:42:24 -04:00
Markus Rossi 4730602ceb Strip leading slash left in front of drive letter by uri.path (see GH-7570). 2016-07-12 15:20:04 +03:00
Markus Rossi 8768d7921d Fix for #7568 Windows drive letter in config.vm.box_url is ignored 2016-07-12 12:01:23 +03:00
Yuya.Nishida 05782f1d0e A more reliable way to detect Ubuntu
lsb_release command is included in lsb-release package. Sometimes this is
not installed; ex: Docker official Ubuntu image.
/etc/os-release is included in base-files package,
so this is more reliable than lsb_release.
2016-06-28 01:57:35 +09:00
Seth Vargo a4f45a18a6
Update CHANGELOG 2016-06-20 17:49:55 -07:00
Seth Vargo becd8f7086
Re-add typekit 2016-06-20 17:48:58 -07:00
Seth Vargo 0a5bdbd39c Merge pull request #7505 from mitchellh/sethvargo/reset
core/bundler: Reset specs in a way that works with new Rubygems
2016-06-20 20:48:05 -04:00
Seth Vargo 05aafedc6d
core/bundler: Reset specs in a way that works with new Rubygems 2016-06-20 15:19:21 -07:00
Seth Vargo cc350229bb
Update CHANGELOG 2016-06-20 09:37:55 -04:00
Seth Vargo c6f2f3bd12 Merge pull request #7499 from mitchellh/sethvargo/ensure_delete
core/box_collection: Ensure removal
2016-06-20 09:31:06 -04:00
Seth Vargo cf1b18d6b2
Move wiki information to source 2016-06-20 08:20:53 -04:00
Seth Vargo 23e50c98f9
core/box_collection: Ensure removal
The docs for Ruby say Pathname#rmtree will recursively delete, but
apparently that is a lie, at least on Windows (see GH-7496). Switch to
using FileUtils to ensure the directory is deleted.

Fixes GH-7496
2016-06-20 07:16:08 -04:00
Seth Vargo 5650896732
Update CHANGELOG 2016-06-19 17:17:04 -04:00
Seth Vargo 49f2a0e7e9 Merge pull request #7487 from codekaizen/master
Fixing version check and catch statement in get_vm_status
2016-06-19 17:15:44 -04:00
Seth Vargo 9c6fee2778
Update CHANGELOG 2016-06-19 14:40:21 -04:00
Seth Vargo bfc951ee20 Merge pull request #7492 from mitchellh/sethvargo/linux_nfs
guests/linux: Ensure NFS retries when mounting
2016-06-19 14:39:39 -04:00
Seth Vargo 1ba3da5c90
Update CHANGELOG 2016-06-19 14:38:38 -04:00
Seth Vargo d93a2d6afc Merge pull request #7491 from mitchellh/sethvargo/osx_guest
guests/darwin: Allow ipv6 static networks
2016-06-19 14:38:07 -04:00
Seth Vargo 851eff1288
guests/linux: Ensure NFS retries when mounting
Fixes GH-7443
2016-06-19 14:34:33 -04:00
Seth Vargo 177b7784dd
guests/darwin: Allow ipv6 static networks 2016-06-19 12:01:52 -04:00
Rory Plaire d3859a33aa Fixing version check and catch statement in get_vm_status
Use the version of Hyper-V instead of Powershell to determine which
exception is thrown by Get-VM. Also fixing an invalid catch statement,
since Powershell can not use variables to match thrown exceptions in
catch.
2016-06-18 17:13:24 -07:00
Seth Vargo 22c24d619c
Update CHANGELOG 2016-06-18 15:12:42 -04:00
Seth Vargo 2cbc819298 Merge pull request #7484 from mitchellh/sethvargo/bsd_halt
guests/bsd: Centralize logic for halting guests
2016-06-18 15:12:09 -04:00
Seth Vargo f46e09362c
Update CHANGELOG 2016-06-18 15:08:47 -04:00
Seth Vargo 8561a12f61 Merge pull request #7483 from mitchellh/sethvargo/global_box_update_disable
core: Provide a way to globally disable box update checking
2016-06-18 15:07:10 -04:00
Seth Vargo 07e6d0e707
guests/bsd: Centralize logic for halting guests 2016-06-18 15:06:20 -04:00
Seth Vargo 3f27af7e95
core: Provide a way to globally disable box update checking
This adds a new environmental variable `VAGRANT_BOX_UPDATE_CHECK_DISABLE`,
which instructs Vagrant to not check for box updates when running
regular Vagrant commands. This behaves the same as the existing
`config.vm.box_update_check` configuration option, but can be set
globally. Vagrantfile-supplied options will take precedence.

Fixes GH-7479
2016-06-18 14:46:46 -04:00
Seth Vargo 3174c0079b
Update CHANGELOG 2016-06-18 14:19:52 -04:00
Satoshi Matsumoto de9abc8f72
guests/redhat: fix network configuration in CentOS 5
ip command is not on PATH by default in CentOS 5 so call it with the full path.
2016-06-18 14:14:25 -04:00
Seth Vargo 01fd5c1dd1
Update CHANGELOG 2016-06-18 13:54:18 -04:00
Seth Vargo f357d0d018 Merge pull request #7481 from mitchellh/sethvargo/bsd_keys
guests/bsd: Centralize logic for public key management
2016-06-18 13:53:37 -04:00
Seth Vargo 079acb42cd
guests/bsd: Centralize logic for public key management 2016-06-17 21:36:28 -04:00
Seth Vargo dbb756c7b6
Update CHANGELOG 2016-06-17 21:10:47 -04:00
Seth Vargo 3cd3cac52f Merge pull request #7480 from mitchellh/sethvargo/bsd_nfs
guests/bsd: Move NFS mounting logic into shared
2016-06-17 21:09:38 -04:00
Seth Vargo 6284a9ac50
guests/bsd: Move NFS mounting logic into shared
A number of the BSD guests used very old mounting options or just
ignored some parameters entirely. This fixes that.

- Closes #7474
- Fixes #7466
2016-06-17 21:04:23 -04:00
Seth Vargo 5dde0cdc4d
Update CHANGELOG 2016-06-17 20:27:59 -04:00
Seth Vargo ce22a3e90d Merge pull request #7478 from mitchellh/sethvargo/bsd_cap
guests/bsd: Add shared BSD guest for common behavior
2016-06-17 20:26:33 -04:00
Seth Vargo 0c268f7b3f
guests/bsd: Add shared BSD guest for common behavior 2016-06-17 20:16:36 -04:00
Seth Vargo d0006d189b Merge pull request #7477 from mitchellh/sethvargo/sym
Use symbols for defining guest capabilities
2016-06-17 19:57:38 -04:00
Seth Vargo b29864f450
Use symbols for defining guest capabilities 2016-06-17 19:55:04 -04:00
Gilles Cornu 2ffcadc7b8
up version for dev 2016-06-17 06:04:14 +02:00
Seth Vargo 4305dac19f
Update CHANGELOG 2016-06-16 16:28:07 -04:00
Seth Vargo 5e0f5ae9df Merge pull request #7467 from mitchellh/sethvargo/check_output
Check stdout instead of process output
2016-06-16 22:27:13 +02:00
Seth Vargo d01ddeeb43
Check stdout instead of process output
Fixes GH-7465
2016-06-16 16:20:15 -04:00