Paul Hinze
25ff636ee2
providers/virtualbox: cleanup default vbox dhcp server
...
fixes #3083
Detect the presence of the default DHCP server that comes in a fresh
VirtualBox install and clean it up to prevent it from colliding with
Vagrant-managed network config.
In order to accomplish this, we:
- add a `remove_dhcp_server` call to the virtualbox driver
- fix dhcp options parsing to allow `:dhcp_{ip,lower,upper}`
configuration options to make it through (so a user can override the
removal behavior with some explicit configuration)
- add the full `:network_name` to the details returned from
`:read_dhcp_servers`, so we can have a durable value to pass to
`:remove_dhcp_server`
Note that we do have to eat one more `VBoxManage list dhcpservers` for
each network interface to support this, but this seemed like a nominal
cost
2014-11-30 22:03:52 -06:00
Paul Hinze
24b6f21d1d
providers/virtualbox: extract reading dhcpservers from hostonlyifs
...
This is just a refactor, no behavior change.
Instead of stitching together dhcpserver info in the structure returned
from `read_host_only_interfaces`, sprout a new driver method called
`read_dhcp_servers` to return that information separately.
This means that driver clients (well there's really only _one_ client in
`ProviderVirtualBox::Action::Network`) have to do a bit more work to get
interface and DHCP server information.
But this gives us (a) a cleaner and more consistent driver interface and
(b) groundwork for a fix for #3083 , which will require interacting with
DHCP servers outside of the context of host-only interfaces.
2014-11-30 22:03:52 -06:00
Chris Jones
b19abebdf0
Grammar fix to the network interface bridge question
2014-10-31 15:16:02 -04:00
Mitchell Hashimoto
37a4000722
providers/virtualbox: more descriptive error if empty version [GH-4657]
2014-10-24 09:20:08 -07:00
Mitchell Hashimoto
b656bf4ae5
providers/docker: build output [GH-3739]
2014-10-23 15:03:09 -07:00
Mitchell Hashimoto
4ffaaf119e
providers/virtualbox: more hints when choosing interface [GH-4463]
2014-10-23 10:24:07 -07:00
Mitchell Hashimoto
f122ed756c
Merge pull request #4571 from jperville/docker-provider-allow-multiple-links-to-same-backend
...
providers/docker: allow multiple links to same backend (different aliases)
2014-10-23 09:45:14 -07:00
Mitchell Hashimoto
a6c0989bc6
Revert "Merge pull request #4616 from crypt1d/master"
...
This reverts commit aec69c4627
, reversing
changes made to 88754d2904
.
2014-10-23 09:30:46 -07:00
Mitchell Hashimoto
aec69c4627
Merge pull request #4616 from crypt1d/master
...
Consider the host_ip value when handling port collisions
2014-10-23 09:26:31 -07:00
Mitchell Hashimoto
2a8f74f54a
providers/virtualbox: style
2014-10-23 09:12:41 -07:00
Mitchell Hashimoto
7287604450
Merge pull request #4671 from jramnani/fix/master/nfs_exports_file_for_freebsd_guests
...
Fix #4658 . Bad NFS exports file on OS X & BSD hosts.
2014-10-23 09:12:00 -07:00
Mikhail Zholobov
5197945e56
providers/virtualbox: Remove unused method "using_nfs?"
...
Related to [GH-4344]
2014-10-23 11:04:21 +04:00
Mitchell Hashimoto
1e6259dd00
providers/docker: set preparing set to avoid data dir clear [GH-3873]
2014-10-22 20:52:08 -07:00
Mitchell Hashimoto
0e29dd5668
commands/rsync: handle proxy machines [GH-4066]
2014-10-22 16:17:39 -07:00
Mitchell Hashimoto
296d0639cc
providers/docker: support auth [GH-4042]
2014-10-22 13:12:31 -07:00
Mitchell Hashimoto
cff57c8d01
core: trigger machine_id_changed for reload [GH-3963]
2014-10-22 12:07:49 -07:00
Mitchell Hashimoto
1ee46d3c95
providers/docker: check proper state for docker-logs [GH-3990]
2014-10-22 11:20:00 -07:00
Mitchell Hashimoto
9c23e4d9cb
providers/docker: expand vagrant_vagrantfile [GH-4000]
2014-10-22 11:02:26 -07:00
Mitchell Hashimoto
59fe62ec11
providers/docker: public_address reports host machine addr [GH-4342]
2014-10-22 10:37:32 -07:00
Mitchell Hashimoto
7988f0fb7c
Fix broken unit tests
2014-10-22 09:44:48 -07:00
Mitchell Hashimoto
57a1269e35
providers/docker: read the container ID properly
2014-10-22 09:33:57 -07:00
Mitchell Hashimoto
7ccec33460
providers/virtualbox: define a sync_folders action to setup NFS
...
[GH-4344]
2014-10-22 09:26:38 -07:00
Mitchell Hashimoto
9d4ab18f42
providers/docker: stop_timeout [GH-4504]
2014-10-21 17:50:45 -07:00
Mitchell Hashimoto
e749eaa039
providers/docker: more robustly detect built image [GH-4598]
2014-10-21 17:44:48 -07:00
Mitchell Hashimoto
fb1a825c0d
providers/docker: host IP and protocol is respected [GH-4505]
2014-10-21 17:17:34 -07:00
Mitchell Hashimoto
5228437b30
providers/docker: nicer error if package is called [GH-4595]
2014-10-21 17:04:46 -07:00
Mitchell Hashimoto
7f432422e1
providers/docker: properly copy create_args in config [GH-4526]
2014-10-21 16:39:26 -07:00
Mitchell Hashimoto
58f7310444
providers/virtualbox: detect conflict in name [GH-4681]
2014-10-21 15:56:32 -07:00
Jeff Ramnani
bd5fd7ab18
Fix #4658 . Bad NFS exports file on OS X & BSD hosts.
...
For FreeBSD guests, Virtualbox can sometimes report the private network
interface IP address as "0.0.0.0". This will cause an invalid NFS
exports file to be generated for FreeBSD and OS X hosts.
Fixed by not allowing Virtualbox to report a guest IP address of
"0.0.0.0".
2014-10-20 12:35:30 -05:00
crypt1d
ca1456ff82
initial changes for forwarding port modifications
2014-10-10 13:01:04 +02:00
Julien Pervillé
97341c3234
providers/docker: allow multiple links to same backend (different aliases).
2014-09-29 18:46:01 +02:00
Mitchell Hashimoto
951dc934cc
providers/virtualbox: cleaner ignore DHCP
2014-09-04 14:20:03 -07:00
Simo Leone
71119590e8
Fix NFS when DHCP settings use a custom IP range
...
Only use the static IP if it is indeed a static IP. Otherwise assume
it's DHCP and get the IP that way.
2014-09-02 13:17:30 -07:00
Mitchell Hashimoto
9ff18fb1b7
providers/docker: unique name with docker-run
2014-08-30 22:29:46 -07:00
Ray Clanan
f1e730e9a1
Unset container name if docker_run is called. Fixes #4294
2014-08-29 23:29:58 -04:00
Mitchell Hashimoto
b4345968a5
providers/docker: SSH extra args go to Docker container [GH-4378]
2014-08-29 11:11:53 -07:00
Leo Simons
fec14cf04c
Use -f argument to rm to force-remove files.
...
When using pty=true, removing files using sudo may request confirmation,
which will hang the connection.
Similarly, sometimes assumptions about file existence may be wrong and
in those cases it seems better to continue on as long as the file does
not exist, so -f makes sense there, too.
2014-08-29 10:51:31 +02:00
Mitchell Hashimoto
7068f4e37b
Merge pull request #4324 from mwrock/generation
...
providers/hyper-v: fixes import for hyper-v generation 2 VMs
2014-08-10 20:42:30 -07:00
Paris Holley
802d17a248
remove vm by default when using docker run
2014-08-09 12:03:35 -07:00
Matt Wrock
be75702f35
fixes import for hyper-v generation 2 VMs
2014-08-09 10:30:10 -07:00
Mitchell Hashimoto
2214591bef
providers/hyperv: fix double-dot in drive name [GH-4318]
2014-08-08 12:15:03 -07:00
Mitchell Hashimoto
ae1a03903e
providers/virtualbox: error if can't read VM name [GH-4047]
2014-08-08 10:49:07 -07:00
Mitchell Hashimoto
1428ab0404
providers/docker: single port works [GH-3991]
2014-08-06 15:34:41 -07:00
Mitchell Hashimoto
0f3e4242df
Merge pull request #3934 from xstevecs/master
...
providers/virtualbox: Disable automatic enablement of hostiocache
2014-08-06 10:27:20 -07:00
Mitchell Hashimoto
3b2e3b6a69
Merge pull request #4207 from stevemcc/enhancement/virtualbox_36_nic
...
Changed hardcoded number of interfaces, fixes #4206 .
2014-08-06 09:51:30 -07:00
Matt Wrock
efd7c619d1
accept vhd as well as vhdx file types on hyper-v
2014-07-17 02:50:51 -07:00
Steve McConville
de7ed34120
Changed hardcoded number of interfaces, fixes #4206 .
2014-07-17 09:52:57 +01:00
Keith Shook
93f84f53e5
Ensure VirtualBox virtual disks are stored in the correct directory round 2
2014-07-02 10:08:44 -04:00
Keith Shook
0912ddaf5f
Ensure VirtualBox virtual disks are stored in the correct directory on Windows hosts
2014-07-02 08:55:00 -04:00
Akzhan Abdulin
bf2e8deebe
VirtualBox driver should replace only last occurence of suggested VM name.
2014-07-02 08:52:31 -04:00
steve
9444e2dc43
Disable automatic ennoblement of hostiocache
...
This can cause behavior that requires re stat’ing
files to for the guest to realize they have
changed. Prevents manually dialing this option.
2014-05-29 10:27:00 -07:00
Mitchell Hashimoto
6369d870d8
providers/docker: support for UDP forwarded ports [GH-3886]
2014-05-23 10:16:16 -07:00
Kalman Hazins
bb052366f7
Change symbols inside hashes to 1.9 JSON-like syntax
2014-05-22 12:35:12 -04:00
Mitchell Hashimoto
6c5251f499
providers/docker: verify host VM SSH is ready [GH-3838]
2014-05-20 20:41:48 -07:00
Mitchell Hashimoto
4e7a25f6de
Merge pull request #3807 from mitchellh/fix-docker-ssh-wo-host-vm
...
providers/docker: Fix SSH access to container when no Host VM is in use
2014-05-20 20:32:21 -07:00
Mitchell Hashimoto
5bd0a99b31
providers/docker: don't port map SSH if no has_ssh [GH-3857]
2014-05-20 19:47:21 -07:00
Mitchell Hashimoto
5ca475fc7d
providers/virtualbox: check VBOX_MSI_INSTALL_PATH on Win [GH-3852]
2014-05-20 19:37:18 -07:00
Mitchell Hashimoto
efd67e6c9d
providers/docker: retry container ssh command [GH-3763]
2014-05-17 13:14:07 -07:00
Mitchell Hashimoto
f2b4f5411a
providers/docker: don't use graceful shutdown [GH-3798]
2014-05-17 12:16:32 -07:00
Fabio Rehm
7eecf31faa
providers/docker: Fix SSH access to container when no Host VM is in use [GH-3799]
2014-05-15 20:14:10 -03:00
Takekazu Omi
90ca838174
Just add missing message for destroy command ask N for hyper-v provider.
...
mitchellh/vagrant#3752
2014-05-12 17:00:59 +09:00
Mitchell Hashimoto
ca6e2393bd
core: providers can choose to not be defaultable [GH-3742]
2014-05-09 16:02:09 -07:00
Mitchell Hashimoto
745bdf6766
providers/docker: ability to specify build dir synced folder opts [GH-3727]
2014-05-08 18:46:03 -07:00
Mitchell Hashimoto
aee71a093b
providers/docker: forward ports properly
2014-05-08 13:37:55 -07:00
Gosha Arinich
faba9bdae9
Revert "providers/docker: Container links are an array, not a hash"
...
This reverts commit b68cb6d7b4
.
2014-05-08 21:10:37 +03:00
Mitchell Hashimoto
9a8a0499c7
providers/docker: don't use HGFS on VMware fusion [GH-3687]
2014-05-08 10:06:06 -07:00
Mitchell Hashimoto
030c1ee481
providers/docker: build_args [GH-3684]
2014-05-07 18:41:24 -07:00
Mitchell Hashimoto
b2f9e86135
providers/docker: make sure command isn't scoped
2014-05-07 15:12:30 -07:00
Mitchell Hashimoto
61caaa00c6
commands/docker-run: --help works [GH-3698]
2014-05-07 15:11:57 -07:00
Mitchell Hashimoto
a00d2481f5
providers/docker: put sync folders in var lib docker [GH-3680]
2014-05-07 15:09:53 -07:00
Mitchell Hashimoto
cc75eb188f
providers/docker: support custom shell properly [GH-3697]
2014-05-07 15:00:51 -07:00
Fabio Rehm
b68cb6d7b4
providers/docker: Container links are an array, not a hash
2014-05-07 12:12:16 -03:00
Mitchell Hashimoto
ca428388d8
providers/docker: can set default provider to docker [GH-3662]
2014-05-06 21:49:49 -07:00
Michael Louis Thaler
9dcc53673a
Fix error reporting bug
...
There's no "command" variable; it should be "cmd". This bug causes it to print an unhelpful exception if the Docker command fails.
2014-05-06 17:46:09 -04:00
Mitchell Hashimoto
48f5b0d53b
providers/virtualbox: package --base should use vboxsf
2014-05-06 13:48:32 -07:00
Mitchell Hashimoto
7e6ba7fa50
providers/virtualbox: check for provider config nilness
2014-05-06 13:10:22 -07:00
Mitchell Hashimoto
337e51c2a6
providers/docker: don't reload if not created
2014-05-05 22:06:22 -07:00
Mitchell Hashimoto
38d1f0c0aa
providers/docker: smarter destroy, does not require host machine
2014-05-05 22:02:13 -07:00
Mitchell Hashimoto
a34ee404d8
providers/*: use special NOT_CREATED_ID if not created
2014-05-05 21:52:28 -07:00
Mitchell Hashimoto
ff2f035f27
providers/docker: less hack way to clear ID if not created
2014-05-05 21:37:02 -07:00
Mitchell Hashimoto
b26ecb0150
providers/docker: smarter about setting ID to nil for machine
2014-05-05 21:35:08 -07:00
Mitchell Hashimoto
d526dd54fe
core: MachineIndex#valid? checks state and ID again
2014-05-05 21:29:40 -07:00
Mitchell Hashimoto
52c249ff8c
providers/virtualbox: higher priority than default
2014-05-05 21:13:56 -07:00
Mitchell Hashimoto
35c8504452
providers/hyperv: lower priority for Windows
2014-05-05 21:13:25 -07:00
Mitchell Hashimoto
d7a9bcda47
providers/docker: vagrant_machine setting works proprely
2014-05-05 21:13:15 -07:00
Mitchell Hashimoto
f475df0987
providers/virtualbox: don't do transient by default
2014-05-05 15:44:45 -07:00
Mitchell Hashimoto
e1e96fac2f
providers/hyperv: vagrant ssh_run action [GH-3615]
2014-05-04 17:31:55 -07:00
Mitchell Hashimoto
a8d51a2452
providers/virtualbox: remove old print
2014-05-01 21:19:14 -07:00
Mitchell Hashimoto
744c9c9663
providers/docker: choose proper provider for host VM
2014-05-01 10:22:43 -07:00
Mitchell Hashimoto
76e29b912f
providers/docker: lower priority
...
We do this mostly because Docker is the only provider that using it
requires some amount of Docker-specific knowledge. VirtualBox, VMware,
etc. kind of "just work". It is not the likely case that someone does
a `vagrant up` and expects Docker, at this point.
2014-05-01 09:51:50 -07:00
Mitchell Hashimoto
9c420b8738
providers/virtualbox: set proper mac address on priv net [GH-3588]
2014-04-30 17:09:29 -07:00
Mitchell Hashimoto
224ee8003d
Merge pull request #3585 from aspiers/backport-3277-old-virtualboxen
...
backport GH-3277 fix for missing interpolation to older drivers
2014-04-30 09:22:59 -07:00
Mitchell Hashimoto
df399d8610
providers/docker: use the proper class
2014-04-30 09:22:02 -07:00
Adam Spiers
082bf37df8
backport GH-3277 fix for missing interpolation to older drivers
...
The original fix for the "missing interpolation argument :stderr" bug
was in d4b3f226
, but it only addressed the driver for VirtualBox 4.3:
https://github.com/mitchellh/vagrant/issues/3277
This backports the fix to the drivers for VirtualBox 4.0, 4.1, and 4.2.
2014-04-30 16:06:20 +01:00
Mitchell Hashimoto
92df8cf6ae
Handle a lot of TODOs
2014-04-29 16:50:58 -07:00
Mitchell Hashimoto
b08c1a62ce
Removing some old files
2014-04-29 16:48:12 -07:00
Mitchell Hashimoto
19af4b70e6
providers/docker: with a pty, single target the docker-run cmd
2014-04-29 16:31:43 -07:00
Mitchell Hashimoto
0bb523ebb0
providers/docker: use ssh_run if asking for stdin on execute
2014-04-29 16:27:22 -07:00
Mitchell Hashimoto
e90e45a8fb
providers/docker: pty flag, not functional yet
2014-04-29 15:51:32 -07:00
Mitchell Hashimoto
ca5651a0b1
providers/docker: clearer options on docker-logs
2014-04-29 14:28:10 -07:00