Commit Graph

2847 Commits

Author SHA1 Message Date
gpurkins dcc7a755c9 added conditional for temporary interfaces 2014-05-21 18:21:05 -04:00
Mitchell Hashimoto 07dbe40e98 Merge pull request #3848 from shtouff/feat-capath
added capath option to curl Downloader
2014-05-20 20:50:26 -07:00
Mitchell Hashimoto 01a8e50235 hosts/windows: use subprocess to execute mstsc [GH-3837] 2014-05-20 20:47:32 -07: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 f94b902023 kernel/v2? more clever: default port to guest port 2014-05-20 20:31:53 -07:00
Mitchell Hashimoto 8856bab04b kernel/v2: default SSH port to 22 2014-05-20 20:31:14 -07:00
Mitchell Hashimoto 6445ca3460 Merge pull request #3825 from marnovdm/feature/salt-windows-guest-provisioning
Feature/salt windows guest provisioning
2014-05-20 20:23:03 -07:00
Mitchell Hashimoto 2771bf8675 commands/rdp: avoid rdp_info being nil 2014-05-20 20:18:15 -07:00
Mitchell Hashimoto 4dbe534c02 commands/rdp: rdp_info cap if avail [GH-3832] 2014-05-20 20:17:21 -07:00
Mitchell Hashimoto d7fa60b5df communicators/winrm: use winrm_info cap if available [GH-3832] 2014-05-20 20:13:36 -07:00
Mitchell Hashimoto f369c13e25 hosts/linux: niceer error if rdesktop not found 2014-05-20 19:58:12 -07:00
Mitchell Hashimoto 2da21e3578 hosts/linux: rdp_client cap [GH-3845] 2014-05-20 19:55:36 -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 0485413d0a Merge pull request #3847 from mitchellh/command-line-too-long-fix-for-winrm
guests/windows: fix #3816 long arg list
2014-05-20 19:38:53 -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 690c119ae2 communicators/winrm: don't look up forwarded port if non-local [GH-3861] 2014-05-20 19:30:53 -07:00
Mitchell Hashimoto 3c4e129fb8 synced_folders/rsync: dup arg list [GH-3864] 2014-05-20 19:24:06 -07:00
Pavel Karoukin 6fc1dd7b8a For #3855
CoreOS vagrant's configuration code look for interface names starting with 'enp0', but in my case when deploying CoreOS image to libvirt environment interfaces had names 'ens4v1', 'ens5v2'

This patch should fix it, but it might be part of a bigger issue and having these two patterns might not cover all possible configurations.
2014-05-20 02:29:53 +02:00
Marno van der Molen 500c40fd42 Now wait for service to be registered before trying to start it 2014-05-19 19:00:18 +02:00
Rémi Paulmier 00a2670406 added capath option to curl Downloader 2014-05-19 18:08:23 +02:00
Marno van der Molen 6c97874839 Wait for to be populated & explicitly check for Running status of service 2014-05-19 17:50:22 +02:00
Shawn Neal 0d3979f80d Fixed issue 3816
Elevated command line is now rendered to a script which is uploaded to the guest and executed. This allows the command line itself to be less than 100 chars to start the script and any user commands are puts into the script which has unlimited* length.
2014-05-19 08:04:59 -07:00
Marno van der Molen fc3a2106fd Only try to copy keys & config if they have been uploaded 2014-05-19 15:52:20 +02:00
Marno van der Molen 1ddef49185 minor indentation fix 2014-05-19 14:10:58 +02:00
Marno van der Molen 6d0dd22864 Also copy minion config in bootstrap-salt.ps1 & update Salt docs to mention syndic/master not supported on Windows 2014-05-19 14:01:31 +02:00
Marno van der Molen 7cb50f8a12 Remove Salt Master & Salt Syndic changes - not supported on Windows by Salt 2014-05-19 14:00:46 +02:00
Marno van der Molen fbd919d52c Retries starting the salt-minion service several times and adds elevated: true to salt calls 2014-05-19 13:14:25 +02:00
Mitchell Hashimoto aa2cbae89b Merge pull request #3818 from RabidGuppy/master
Windows Guest: cannot assign static IP addresses in private_network when running vagrant on windows host
2014-05-19 02:14:06 -07:00
Mitchell Hashimoto 05ccf88c5f Merge pull request #3830 from cstrahan/nixos-guest
Add NixOS guest support
2014-05-18 02:22:02 -07:00
Charles Strahan 38d749dc1f Add NixOS guest support 2014-05-18 04:14:33 -04:00
Mitchell Hashimoto efd67e6c9d providers/docker: retry container ssh command [GH-3763] 2014-05-17 13:14:07 -07:00
Mitchell Hashimoto 9c7fb05d5f guests/darwin: respect NFS mount options [GH-3791] 2014-05-17 12:24:24 -07:00
Mitchell Hashimoto 72de106c8f Update CHANGELOG 2014-05-17 12:21:12 -07:00
Mitchell Hashimoto b1f3ac0783 Merge pull request #3783 from YungSang/topic
kernel/v2: set disabled to false whenever synced folder override
2014-05-17 12:19:50 -07:00
Mitchell Hashimoto f2b4f5411a providers/docker: don't use graceful shutdown [GH-3798] 2014-05-17 12:16:32 -07:00
Mitchell Hashimoto 34b7cace7b synced_folders/rsync: rsync__chown [GH-3810] 2014-05-17 12:01:50 -07:00
Marno van der Molen 01f2c52251 sometimes salt-minion wouldn't start - this seems stable so far across 10 deploys 2014-05-17 03:38:57 +02:00
Marno van der Molen 2ddffa4fc6 redirect output of mkdir statement to out-null in bootstrap-salt.ps1 2014-05-17 03:31:24 +02:00
Marno van der Molen 02f40b35fa Adds minimal implementation to deploy a Salt minion on Windows including support for pre-seeding the keys 2014-05-17 02:19:34 +02:00
Jason D. Smith 18894b81cd Inverting the hash of driver_mac_addresses returned by machine.provider.capability(:nic_mac_addresses).
The previous code expected the hash to use the mac addresses as the keys, the original code had the indices as the keys.
2014-05-16 12:56:30 -04: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
Shawn Neal 823e80fa32 Fixed issue 3729
The logic used to read the file contents sometimes would leave lines behind unread. It now defaults to reading all lines and counts each line it has actually read.
2014-05-15 09:17:57 -07:00
Mitchell Hashimoto 3fb7b5061e commands/halt: halt in reverse order [GH-3790] 2014-05-14 08:29:22 -07:00
Trey Hyde ca986455f3 guests/freebsd: Properly register that the rsync_pre capability belongs to FreeBSD rather than defining re-defining it for Linux. 2014-05-13 18:07:35 -07:00
YungSang 2c688fda16 Set disabled even if no disabled option
to override the previous settings
2014-05-13 15:07:23 -07:00
Paul Cooper @ Agile Barbecue 573683ef00 fix windows guest with puppet and a facter block
Powershell doesn't understand the unix-style ENV=thing command syntax, the old vagrant-windows plugin monkey patched the provisioner to put semicolons between statements to set the variables before running puppet - this fixes the issue inside a windows? block leaving the normal non-windows code path working - therefore works for me on both unix and windows provisions with a facter block in place
2014-05-13 17:31:31 +01: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
Teemu Matilainen f87c7a9bc9 synced_folders\rsync: remove non-portable '-v' flag from chown [GH-3743]
Aside of the already fixed OpenBSD, at least Solaris `chown` seems not
to support the `-v` option, so remove it from all guests.
2014-05-10 23:51:12 +03:00
Mitchell Hashimoto c7abea2032 guests/linux: exclude symlinks from chown search [GH-3744] 2014-05-09 16:08:11 -07:00
Mitchell Hashimoto ca6e2393bd core: providers can choose to not be defaultable [GH-3742] 2014-05-09 16:02:09 -07:00
Mitchell Hashimoto 782c3762cc communicators/ssh: rescue another exception for reset 2014-05-09 15:59:15 -07:00
Matt Behrens a8fb2de7aa remove `-v` flag from post-rsync `chmod`
OpenBSD `chmod` does not support the `-v` flag, which causes
`vagrant up` to fail.
2014-05-09 18:31:23 -04:00
Mitchell Hashimoto 2a973df440 synced_folders/rsync: copy symlinks as real files [GH-3734] 2014-05-09 09:31:31 -07:00
Mitchell Hashimoto 39eaaf3664 provisioners/puppet: windows module sep [GH-3731] 2014-05-09 09:22:36 -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 a9029842a6 kernel/v2: multiple synced folder lines override each other 2014-05-08 18:39:13 -07:00
Mitchell Hashimoto 92940a7c5d synced_folders/nfs: allow disabling export [GH-3636] 2014-05-08 17:10:38 -07:00
Mitchell Hashimoto 434a13b4e4 kernel/v2: automatically forward winrm if comm is winrm [GH-3685] 2014-05-08 17:00:55 -07:00
Fabio Rehm 1eec62cb9e provisioners/shell: Fix shell provisioning when config.binary is set to false [GH-3712]
The `config` in use was the Shell provisioner config that does not expose
access to the VM configs.

References https://github.com/fgrehm/vagrant-lxc/issues/284
2014-05-08 18:55:07 -03:00
Mitchell Hashimoto 1ae99e3a2e kernel/v2: convert network type to symbol earlier 2014-05-08 13:38:40 -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 338328fa15 kernel/v2: hostnames can be one character [GH-3713] 2014-05-08 09:10:13 -07:00
Mitchell Hashimoto 030c1ee481 providers/docker: build_args [GH-3684] 2014-05-07 18:41:24 -07:00
Mitchell Hashimoto e1815a13e8 commands/rdp: support extra args to RDP client [GH-3686] 2014-05-07 18:32:20 -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
Mitchell Hashimoto b47df84887 communicators/winrm: fix tests 2014-05-07 10:09:14 -07:00
Mitchell Hashimoto 882c9ad7f6 communicators/winrm: good_exit option 2014-05-07 09:47:47 -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
Mitchell Hashimoto 8bb9d18260 guests/windows: nicer error if winrm not in use to configure networks [GH-3651] 2014-05-06 19:00:58 -07:00
Mitchell Hashimoto 326e8012f7 guests/*: setup rsync_pre properly 2014-05-06 18:40:55 -07:00
Mitchell Hashimoto 25589e509e commands/reload: if --provision is present, force provision [GH-3657] 2014-05-06 16:27:58 -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 4ef237a642 synced_folders/rsync: mkdir before rsync 2014-05-06 13:41:37 -07:00
Mitchell Hashimoto e7a5dc4f8e Revert "Merge pull request #3643 from cammoraton/rhel7-plugin-fixes"
This reverts commit 919d0b9f4b, reversing
changes made to 924c47feb3.
2014-05-06 13:26:44 -07:00
Mitchell Hashimoto 7e6ba7fa50 providers/virtualbox: check for provider config nilness 2014-05-06 13:10:22 -07:00
Mitchell Hashimoto 9d2d4b9675 guests/mint: don't need to inherit from ubuntu class 2014-05-06 12:50:35 -07:00
Chris Hubbard fd86f5a57e Add Linux Mint detection
* Linux Mint is a popular distribution based on Ubuntu
* When creating a VM based on Linux Mint, it cannot detect
that it is based on Ubuntu and it is detected as just linux
and configure_networks fails
* https://github.com/mitchellh/vagrant/issues/3647
2014-05-06 15:09:33 -04:00
Mitchell Hashimoto 771f951096 Merge pull request #3638 from jtopper/nfs-sudo-improvements
Improve use of sudo for NFS export manipulation
2014-05-06 08:47:50 -07:00
Mitchell Hashimoto 919d0b9f4b Merge pull request #3643 from cammoraton/rhel7-plugin-fixes
Rhel7 guest plugin fixes
2014-05-06 08:42:24 -07:00
Jonas Stendahl 8b5869fdc5 Don't wrap the escaped password in single quotes. 2014-05-06 15:47:44 +02:00
cammoraton 6d6282f1be Finished up fixes. Removed some artifacts. 2014-05-06 08:48:01 -04:00
cammoraton 5345c1479a Fix configure networks and templates to work off polled interface names. 2014-05-06 08:44:36 -04:00
cammoraton 6ff81dc29c Add interfaces_list capability to get list of interfaces via biosdevname
or dmesg parsing.
2014-05-06 08:44:15 -04:00
Jon Topper 6ec9e3e279 Linux stuff now tested and working! 2014-05-06 12:24:35 +01:00
Jon Topper 4a4ca74dea Added missing 'sudo' call. 2014-05-06 10:05:53 +01: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
Jon Topper 0da334156b Fix up the Linux host too 2014-05-05 23:56:39 +01:00
Jon Topper e5490544d6 Use 'tee' to write to /etc/exports 2014-05-05 23:55:16 +01:00
Mitchell Hashimoto f475df0987 providers/virtualbox: don't do transient by default 2014-05-05 15:44:45 -07:00
Mitchell Hashimoto 19050d26cf guests/debian: setting hostname works without 127.0.1.1 [GH-3271] 2014-05-04 18:32:33 -07:00
Mitchell Hashimoto 04369b3afe guests/linux: LANG=en for ifconfig [GH-3029] 2014-05-04 17:47:16 -07:00
Mitchell Hashimoto e3ec1027f1 commands/init: minimal flag [GH-3611] 2014-05-04 17:36:51 -07:00
Mitchell Hashimoto fafab47178 Merge pull request #3625 from sciurus/check_nfs_usability
synced_folders/nfs: implement usable?
2014-05-04 17:33:10 -07:00
Mitchell Hashimoto e1e96fac2f providers/hyperv: vagrant ssh_run action [GH-3615] 2014-05-04 17:31:55 -07:00
Gilles Cornu 52a44de10c provisioners/ansible: show ansible-playbook in use
Motivation:
By printing out the ansible command used behind the scene, we can ease
the support effort to very quickly identify whether a problem is due to
Vagrant provisioner or Ansible itself.
2014-05-04 22:54:12 +02:00
Brian Pitts 9f62216f87 Remove check for nfs in config 2014-05-03 16:10:01 -05:00
Brian Pitts 4d90fdfec5 Check usability of nfs on host 2014-05-03 16:09:08 -05:00
Mitchell Hashimoto 604ae6caa3 communicators/ssh: detect if config.ssh.shell is non-functional [GH-3040] 2014-05-01 21:35:02 -07:00
Mitchell Hashimoto a8d51a2452 providers/virtualbox: remove old print 2014-05-01 21:19:14 -07:00
Mitchell Hashimoto c303f82170 Merge pull request #3603 from eykd/feature/colorize-salt-output
provisioner/salt: Add colorization and log_level support to salt provisioner.
2014-05-01 13:47:44 -07:00
deyk 567af495d4 Add colorization and log_level support to salt provisioner.
This commit adds two new options to the salt provisioner:

- `colorize`: controls color output. Defaults to no-color (present behavior).
- `log_level`: controls log level. Defaults to `debug` (present behavior).

Docs included!
2014-05-01 11:10:09 -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
Shawn Neal c99a1fb2ae Display deprecation warning for unused halt config properties
halt_timeout and halt_check_interval will be removed in the next version of Vagrant, 1.7.
2014-05-01 09:03:49 -07:00
Shawn Neal f4b67df978 Removed unused halt timeout and check interval settings. 2014-05-01 08:00:41 -07:00
Shawn Neal cc905d7923 Fix remote/downloaded shell scripts
The temporary shell script that we downloaded the script too was being deleted twice, thus causing an error on the secondary delete.
2014-04-30 19:39:37 -07:00
Shawn Neal 392269a8eb Default the WinRM shell provisioner to privileged (elevated) 2014-04-30 19:35:02 -07:00
Shawn Neal 068b5cf0b9 Move Windows symlink re-establishment after reboot into capability
This reduces the complexity and likelihood of provisioner bugs.
2014-04-30 17:36:36 -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 f80fdfa32a privisoners/salt: proper bootstrap URL [GH-3583] 2014-04-30 15:32:20 -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
Mitchell Hashimoto 013fc729a5 providers/docker: raise better error for local executor 2014-04-29 14:16:24 -07:00
Timothy Messier 513a9bf1ab Set u+w perms on private keys in tmp dir.
This should allow additional `vagrant provision` calls to work when
using the salt provisioner and providing private keys. See #3542.
2014-04-29 11:13:12 -04:00
Mitchell Hashimoto ad961b24f5 commands/init: force flag [GH-3564] 2014-04-28 20:22:09 -07:00
Mitchell Hashimoto 90234dc32f synced_folders/rsync: fix oddness on Windows 2014-04-28 14:49:33 -07:00
Mitchell Hashimoto d7343c5b56 providers/docker: expand path to share relative to docker env 2014-04-28 11:08:58 -07:00
Mitchell Hashimoto d7ecd99e2e providers/docker: be more lenient about deleting built image 2014-04-28 09:36:55 -07:00
Mitchell Hashimoto 8ed5351dd1 providers/docker: destroy built image on up 2014-04-27 19:36:02 -07:00
Mitchell Hashimoto 27cd8886b3 providers/docker: cleaner reload 2014-04-27 19:27:11 -07:00
Mitchell Hashimoto 12d3e06f69 providers/docker: can docker-run non-existent containers 2014-04-27 19:22:14 -07:00
Mitchell Hashimoto a2b4f31916 providers/docker: don't show cmd if one is not specified 2014-04-27 19:06:39 -07:00
Mitchell Hashimoto 685bdbf1f0 whitespace 2014-04-27 18:58:57 -07:00
Mitchell Hashimoto c818a14072 providers/docker: expose ports 2014-04-27 18:37:25 -07:00
Mitchell Hashimoto ff9de3586a providers/docker: run_command doesn't need to actual setup host machine 2014-04-27 18:28:11 -07:00
Mitchell Hashimoto a8822e84d2 providers/docker: fix some extranneous newlines in streamed output 2014-04-27 18:26:12 -07:00
Mitchell Hashimoto f1e1617cfd providers/docker: stream data for run 2014-04-27 18:23:31 -07:00
Mitchell Hashimoto abf7c0526b providers/docker: docker-run command starting points 2014-04-27 18:10:41 -07:00
Mitchell Hashimoto 2694f746a7 providers/virtualbox: no SSH info if not running 2014-04-27 17:26:24 -07:00
Mitchell Hashimoto ac040102f9 Merge pull request #3544 from benesch/rsync-conservative-chown
synced_folders/rsync: only chown when necessary
2014-04-27 15:59:40 -07:00
Mitchell Hashimoto 8cdf8c7916 Merge pull request #3549 from javornikolov/fix-vbox-install-path-detect-on-windows
providers/virtualbox: Fix vbox install path detection on Windows 8
2014-04-27 15:56:37 -07:00
Mitchell Hashimoto 77fb6d73b8 Merge pull request #3552 from benesch/rsync-auto-handle-interrupt
command/rsync-auto: properly exit on interrupt
2014-04-27 15:54:22 -07:00
Mitchell Hashimoto df86b18263 Update CHANGELOG, fix tests 2014-04-27 15:53:31 -07:00
Mitchell Hashimoto 617a85be06 Merge pull request #3553 from bclarkindy/rsync_ssh_proxy
synced_folders/rsync: Add SSH proxy_command functionality to rsync
2014-04-27 15:52:17 -07:00
Mitchell Hashimoto 91c7fb7749 Merge pull request #3554 from mitchellh/chef-provisioner-cleanup
provisioner/chef: Chef provisioner cleanup with Windows
2014-04-27 15:51:30 -07:00
Timothy Messier adeaf29487 Fixed missing end to if 2014-04-27 12:36:01 -04:00
Timothy Messier b93c6df956 The various `install` args should always be passed to salt-bootstrap.
Even when preforming config only, the install flags (i.e. -M, -S, -N),
are used by the bootstrap to determine which configs to copy.

This should help with #3542 and should supersede #3548.
2014-04-27 12:34:24 -04:00
Shawn Neal cf71634813 DRY'd up Chef command building
There's very little difference between the command building on Linux and Windows other than path formatting. All Chef provisioners support the --no-color argument now.

Added unit tests to verify changes.
2014-04-26 21:07:26 -07:00
Shawn Neal ebca0e7e44 Fixed bug in CommandBuilderWindows
CommandBuilderWindows would not include the Chef binary in the command when the binary_path was specified in the config.

Backfilled unit tests for CommandBuilderWindows
2014-04-26 21:07:26 -07:00
Shawn Neal 68ce06561a Removed old unused WinRM chef provisioner scripts 2014-04-26 21:07:26 -07:00
Shawn Neal 38c7203f92 Chef provisioner should utilize reboot capability 2014-04-26 21:07:26 -07:00
Shawn Neal 99ce95198b First pass at integrating new WinRM elevated execution wrapper
- Removed a lot of the Windows special casing from Chef runs
- Don't attempt to use @config.binary_env since we don't properly pass this along to Chef
2014-04-26 21:07:26 -07:00
Shawn Neal 30b0399431 Use new Ruby hash initializer syntax 2014-04-26 21:07:26 -07:00
Shawn Neal f18a397289 Allow WinRM commands to be run elevated via scheduled task 2014-04-26 21:07:26 -07:00
Shawn Neal 1dd081d866 Don't use interpolated strings for username and password
Its possible that usernames and passwords may contain special characters like $
2014-04-26 21:07:26 -07:00
Shawn Neal 045e06455a Added WinRM elevated shell wrapper script
This script creates an immediately run scheduled task using fresh credentials. This is a generic implementation used by the Chef provisioners. The script gets around several limitations in WinRM.

1. Credential hopping
2. The non-default Administrator account sometimes doesn't have true Administrator access when run through WinRM even with UAC disabled.

In short, this script allows commands to run through WinRM just as if they were run directly on the box.
2014-04-26 21:07:26 -07:00
Nikhil Benesch 8fb49f10cc command/rsync-auto: properly exit on interrupt
Currently, interrupting 'vagrant rsync-auto' once it's waiting for
filesystem events has no effect. Appears to be a deadlock related to
signal handlers in Ruby 2.0 [0].

Remove call to `thread.join` in signal handler. The handler doesn't
need to wait for `true` to be added to the queue; it just needs to
launch the thread.

[0]: https://bugs.ruby-lang.org/issues/7917
2014-04-26 16:24:25 -04:00
Brian.Clark fb509ac8b7 Add ssh ProxyCommand functionality to rsync 2014-04-26 13:52:39 -04:00
jjshoe 7ef8477e43 provisioners/ansible: Don't run with two --limits
Conflicts:
	test/unit/plugins/provisioners/ansible/provisioner_test.rb
2014-04-26 11:55:59 +02:00
Yavor Nikolov 2cbaa98751 Fix processing of VBOX_INSTALL_PATH 2014-04-26 11:05:32 +03:00
Nikhil Benesch 2df36892dd synced_folders/rsync: only chown when necessary [GH-3525]
Run remote rsync as root to guarantee that rsync can write to guestpath.
This obviates the need to chown the guestpath to the SSH user prior to
sync.

This brings a substantial speedup (2x on a moderately-sized shared
folder) and properly triggers filesystem notifications on only the files
changed by a given sync.
2014-04-25 15:00:12 -04:00
Mitchell Hashimoto 6870de3f6d core: add Vagrant.latest_version 2014-04-24 20:09:32 -07:00
Mitchell Hashimoto 63dffe3f92 commands/version: check latest version 2014-04-24 19:54:26 -07:00
Mitchell Hashimoto ffdb276d4c Merge pull request #3536 from shadowfax-chc/force-overwrite-salt-configs
provisioners/salt: force overwrite of salt configs and keys.
2014-04-24 19:14:40 -07:00
Mitchell Hashimoto de6759f94d Merge pull request #3538 from mitchellh/f-box-usage
Track box usage (local) to know if envs are using boxes
2014-04-24 10:42:02 -07:00
Timothy Messier c4ae0badc3 Force overwrite of salt configs and keys.
This will tell the salt-bootstrap script to overwrite the master/minion
configs and/or keys each time provision is called. #3524 #3176
2014-04-24 11:56:54 -04:00
Shawn Neal cad3dde760 Fixed whitespacing in command_filter and file_manager 2014-04-24 07:52:13 -07:00
Shawn Neal afeb60c850 ivars should be alphabetized 2014-04-24 07:50:24 -07:00
Shawn Neal d5d9918e48 Cleanup whitespace and comments in WinRM command filters 2014-04-24 07:49:19 -07:00
Shawn Neal ab51a786ff Extract execution_output method from WinRM comm execute 2014-04-23 21:49:28 -07:00
Shawn Neal 4a2a147926 Refactored WinRM test command filter 2014-04-23 21:15:05 -07:00
Shawn Neal f44c795eed Integrated WinRM command filter into communicator
*nix commands are now filtered out instead of being sent to the guest. This means the command_alias PowerShell script is no longer needed.

Moved the PowerShell exit code helper to the WinRM shell and changed it to always return an exit code.
2014-04-23 20:38:16 -07:00
Shawn Neal 1525aa0f78 Added WinRM grep command filter
This is needed because isn't available on Windows and Vagrant guest detection attempts to use grep for some OSs.
2014-04-23 20:37:15 -07:00
Shawn Neal ac81841b01 test command should expand environment variables
'$Env:SystemRoot' does not expand
"$Env:SystemRoot" does expand
2014-04-23 18:26:45 -07:00
Shawn Neal 96ab8f60c5 Added WinRM command filters
These will be used to replace the guest side command_alias script that is sent with every communicator execute call. This avoids some uncessary remote calls to the guest, makes it unit testable, and allows larger PowerShell commands to be invoked.
2014-04-23 17:50:20 -07:00
Mitchell Hashimoto e1c79c4692 commands/global-status: call proper method 2014-04-23 06:21:44 -07:00
Mitchell Hashimoto 5da77dee5c commands/box/remove: add --force flag 2014-04-23 06:16:51 -07:00
Mitchell Hashimoto eae3f3243e Merge pull request #3517 from mitchellh/communicator-support-for-wql
communicator/winrm: Communicator support for wql
2014-04-23 06:02:24 -07:00
Mitchell Hashimoto fbcc6d25b4 Merge pull request #3519 from mitchellh/windows-guest-file-manager
communicators/winrm: Windows guest file manager
2014-04-23 06:01:59 -07:00
Mitchell Hashimoto e985308e9a core: MachineIndex::Entry#valid? method and tests 2014-04-22 17:09:44 -07:00
Shawn Neal 5f4a900d8e Add WinRM file transfer error and english text 2014-04-22 14:54:13 -07:00
Shawn Neal f292232ca8 Added Windows guest file manager for recursive uploads
- Since WinRM uploads are so slow, MD5 content checking is used
2014-04-22 14:42:13 -07:00
Shawn Neal 62f5be49d5 Cleaner DHCP detection for Windows guests 2014-04-22 13:28:51 -07:00
Shawn Neal 728ec28f2d Windows GuestNetwork directly uses the communicator
- Fixed slight Law of Demeter violation
- Make guest access through comm consistent
2014-04-22 11:54:34 -07:00
Shawn Neal 9177bd8a48 Added WQL support to Vagrant communicator execute
- Removed duplication for WQL specific commands
2014-04-22 11:29:22 -07:00
Shawn Neal 929e41aa5c Backfilled unit tests for Windows guest support
- Fixed typo in helper test
- Removed extraneous machine.config prefix from Windows guest config validation
- Added WinRM communicator unit tests
- Added Windows guest capability unit tests
2014-04-22 11:03:37 -07:00
Mitchell Hashimoto a47b85c8c4 synced_folders/rsync: add UserKnownHostsFile to /dev/null [GH-3511] 2014-04-21 20:39:48 -07:00
Mitchell Hashimoto 7cbef9b3d9 providers/docker: doesn't support NFS if b2d [GH-3510] 2014-04-21 20:38:10 -07:00
Mitchell Hashimoto afd3f1ff43 synced_folders/nfs: can say functional is false explicitly 2014-04-21 20:37:14 -07:00
Mitchell Hashimoto ec57a286cd hosts/darwin: use a temp dir since Tempfile is deleted right away 2014-04-21 13:56:43 -07:00
Mitchell Hashimoto db64fbf6ef communicators/winrm: reload shell on reload so we get proper port 2014-04-21 13:56:42 -07:00
Mitchell Hashimoto 7ee9b7cd42 kernel/v2: make sure communicator is a symbol 2014-04-21 13:56:41 -07:00
Mitchell Hashimoto b0b445fcac hosts/darwin: rdp client support by subprocessing `open` 2014-04-21 13:56:40 -07:00
Mitchell Hashimoto a205cf84a0 providers/virtualbox: don't require valid config on destroy [GH-1629] 2014-04-21 13:56:37 -07:00
Mitchell Hashimoto 4372ab034e providers/virtualbox: merge customizations properly 2014-04-21 13:56:32 -07:00
Mitchell Hashimoto 568185c3e9 providers/docker: always copy the host VM Vagrantfile 2014-04-21 13:56:31 -07:00
Mitchell Hashimoto 22d9b0eeb2 guests/linux: unmount uses rmdir instead of rm -rf to avoid catastrophe 2014-04-21 13:56:30 -07:00
Mitchell Hashimoto 2e8f837f9b providers/docker: fix exception typo 2014-04-21 13:56:29 -07:00
Mitchell Hashimoto 89b6336d21 providers/docker: retry sync_folders action 2014-04-21 13:56:28 -07:00
Mitchell Hashimoto e38ae9b5c6 providers/docker: don't guard for image on create, since can come from build 2014-04-21 13:56:27 -07:00
Mitchell Hashimoto 1c3ee6ffa3 providers/docker: rebuild image if it doesn't exist 2014-04-21 13:56:26 -07:00
Mitchell Hashimoto d837086572 providers/docker: get rid of mutex around Docker access, should be safe 2014-04-21 13:56:25 -07:00
Mitchell Hashimoto aa13a43c69 providers/docker: its okay if no image file on destroy 2014-04-21 13:56:23 -07:00
Mitchell Hashimoto 1c7faae1ee provisioners/*: prefix the output 2014-04-21 13:56:19 -07:00
Emilien Kenler b77bd3e6bb Unit test + vault password file existence check 2014-04-21 13:56:16 -07:00
Emilien Kenler dd06dffe85 Ansible Vault support
Add the following options to the Ansible provisioner:
- ask_vault_pass
- vault_password_file
2014-04-21 13:56:15 -07:00
Mitchell Hashimoto bad6537e86 kernel/v2: provider configs do proper merge logic for config 2014-04-21 13:56:14 -07:00
Mitchell Hashimoto 8171471628 providers/docker: make merge logic a bit more sensible 2014-04-21 13:56:13 -07:00
Mitchell Hashimoto 8a76c2bc76 providers/docker: can force a host VM optionally 2014-04-21 13:56:08 -07:00
Mitchell Hashimoto 79793ab130 providers/docker: config validation and specs 2014-04-21 13:56:07 -07:00
Mitchell Hashimoto 0094a58227 providers/docker: when building from Dockerfile, show image ID 2014-04-21 13:56:06 -07:00
Mitchell Hashimoto 052ee624bb providers/docker: forgot a file 2014-04-21 13:56:05 -07:00
Mitchell Hashimoto f78f72920c providers/docker: flatten stack so it runs at one point 2014-04-21 13:56:04 -07:00
Mitchell Hashimoto 067c1ca348 providers/docker: reuse action stacks where possible 2014-04-21 13:56:02 -07:00
Mitchell Hashimoto 67741ad902 providers/docker: fix ordering of removing built images 2014-04-21 13:56:01 -07:00
Mitchell Hashimoto e50eb6c7a9 providers/docker: default host VM doesn't sync folder 2014-04-21 13:56:00 -07:00
Mitchell Hashimoto 53017bccc8 command/rsync-auto: work with provisioner synced folders 2014-04-21 13:55:57 -07:00
Mitchell Hashimoto 16ae728b5f providers/docker: remove built image on reload and destroy 2014-04-21 13:55:55 -07:00
Mitchell Hashimoto 81df70eee0 providers/docker: support building Dockerfiles 2014-04-21 13:55:54 -07:00
Mitchell Hashimoto 3ba0ca3562 providers/docker: fix typo in translation 2014-04-21 13:55:52 -07:00
Mitchell Hashimoto 61388186e9 providers/docker: can set custom container name 2014-04-21 13:55:51 -07:00
Mitchell Hashimoto 58ddc66b9c providers/docker: can specify links 2014-04-21 13:55:50 -07:00
Mitchell Hashimoto 71d615212d providers/docker: can set environmental variables 2014-04-21 13:55:49 -07:00
Mitchell Hashimoto 0a3346c918 providers/docker: warning if synced folders change 2014-04-21 13:55:48 -07:00
Mitchell Hashimoto d1b3165545 providers/docker: cleaner action stacks 2014-04-21 13:55:47 -07:00
Mitchell Hashimoto 35d9256137 providers/docker: only provision if ssh (command) 2014-04-21 13:55:46 -07:00
Mitchell Hashimoto 81818f36fc providers/docker: graceful halt only if SSH is available 2014-04-21 13:55:45 -07:00
Mitchell Hashimoto 4a59c5c522 providers/docker: optimizing the action stacks... 2014-04-21 13:55:44 -07:00
Mitchell Hashimoto c0f5095783 providers/docker: wait for running state, error if not 2014-04-21 13:55:42 -07:00
Mitchell Hashimoto 09cc823065 providers/docker: warning with host VM about forwarded ports 2014-04-21 13:55:41 -07:00
Mitchell Hashimoto 19c9973a0d guests/linux: set a timeout on nc 2014-04-21 13:55:40 -07:00
Mitchell Hashimoto e578e91e3a providers/docker: implement port checker for remote machine 2014-04-21 13:55:39 -07:00
Mitchell Hashimoto 4dabfc1aff providers/docker: clean up forwarded port handling 2014-04-21 13:55:37 -07:00
Mitchell Hashimoto 6ea6ad3e08 providers/docker: only correct port collisions if not host VM 2014-04-21 13:55:36 -07:00
Mitchell Hashimoto 58a043e2aa providers/docker: upload the keys we need for SSH 2014-04-21 13:55:35 -07:00
Mitchell Hashimoto 447f407b0b providers/docker: use a mutex for intra-process lock 2014-04-21 13:55:31 -07:00
Mitchell Hashimoto 3edfe6deaf providers/docker: remove synced folders after docker rm 2014-04-21 13:55:28 -07:00
Mitchell Hashimoto cd38f891da providers/docker: disable synced folders on destroy 2014-04-21 13:55:27 -07:00
Mitchell Hashimoto 704ff98200 providers/docker: only sync folders if they're not already there 2014-04-21 13:55:26 -07:00
Mitchell Hashimoto 10e51eb141 providers/docker: initial sync folders working through proxy VM 2014-04-21 13:55:20 -07:00
Mitchell Hashimoto c1f14320bd providers/docker: process-level lock on host machine up 2014-04-21 13:55:13 -07:00
Mitchell Hashimoto afb61b1466 providers/virtualbox: synced folder supports the "disable" method 2014-04-21 13:55:12 -07:00
Mitchell Hashimoto e119a5714a core: add "disable" method for synced folders, deprecate "prepare" 2014-04-21 13:55:09 -07:00
Mitchell Hashimoto c3e6c794cd synced_folders/nfs: acquire process-level lock for export 2014-04-21 13:55:07 -07:00
Mitchell Hashimoto 7da9ad0fa6 commands/destroy: change exit codes [GH-811] 2014-04-21 13:55:01 -07:00
Mitchell Hashimoto a2a822c6e6 providers/docker: SSH action re-uses the communicator helpers 2014-04-21 13:54:58 -07:00
Mitchell Hashimoto 4477545d3f providers/docker: execute the proxied SSH in a shell 2014-04-21 13:54:57 -07:00
Mitchell Hashimoto e947960c09 providers/docker: use a custom communicator to go through host VM 2014-04-21 13:54:56 -07:00
Mitchell Hashimoto bdade7d5a6 providers/docker: notify when proxying SSH 2014-04-21 13:54:55 -07:00
Mitchell Hashimoto e714720052 providers/docker: `vagrant ssh` proxies through the host VM 2014-04-21 13:54:54 -07:00
Mitchell Hashimoto 6721d8e964 communicators/ssh: just use Ruby 2.0 features 2014-04-21 13:54:52 -07:00
Mitchell Hashimoto c220bfc27d providers/docker: TODO for me 2014-04-21 13:54:51 -07:00
Mitchell Hashimoto 56f9fdac21 commands/docker-logs: exit status 1 if no logs were retrieved 2014-04-21 13:54:49 -07:00
Mitchell Hashimoto eab553ad55 providers/docker: better comments 2014-04-21 13:54:48 -07:00
Mitchell Hashimoto cb95e8aaee commands/docker-logs: parallelize for multiple containers 2014-04-21 13:54:47 -07:00
Mitchell Hashimoto da0db72054 providers/docker: docker-attach => docker-logs 2014-04-21 13:54:45 -07:00
Mitchell Hashimoto 54de2e3c6f providers/docker: docker-attach command for following output 2014-04-21 13:54:44 -07:00
Mitchell Hashimoto b655b6d910 providers/docker: remove TODO 2014-04-21 13:54:41 -07:00
Mitchell Hashimoto 144c874b5a providers/docker: process-level lock on copying default Vagrantfile 2014-04-21 13:54:40 -07:00
Mitchell Hashimoto bed34a730b provisioners/docker: fix module name for new docker provider 2014-04-21 13:54:35 -07:00
Mitchell Hashimoto 8c7ab333a0 Squash the f-docker-hostmachine branch.
Initial work

commands/up: make sure all names to with_target_vms are strings

providers/docker: create a docker host VM if needed

providers/docker: executor abstraction for driver to eventually support remote

providers/docker: vagrant executor

providers/docker: support creating the machine

providers/docker: status works if host VM is gone

providers/docker: use start fence to get real docker output

core: Call preserves stack ordering

core: support Message post option

providers/docker: Guard some features with HasSSH checks

providers/docker: much better messaging around create/destroy

providers/docker: output the container ID on create

providers/docker: copy the hostmachine Vagrantfile to the data dir

providers/docker: should make host machine before any up action

providers/docker: HandleBox before the host machine

providers/virtualbox: functional_vboxsf to disable vboxsf

providers/virtualbox: synced folder usable method should take 2 args

providers/docker: default machine name to :default
2014-04-21 13:54:33 -07:00
Mitchell Hashimoto 2b07dec059 core: Use the MachineIndex#vagrant_env method 2014-04-21 13:54:31 -07:00
Mitchell Hashimoto 09ff31e3a3 commands/global-status: add --prune flag 2014-04-21 13:54:29 -07:00
Mitchell Hashimoto 7c8053cb2b hosts/windows: don't remove the rdp file, race condition 2014-04-21 13:54:21 -07:00
Mitchell Hashimoto 5b5f10e175 commands/rdp: config 2014-04-21 13:54:20 -07:00
Mitchell Hashimoto 3d0a2959cd commands/rdp: nicer output 2014-04-21 13:54:19 -07:00
Mitchell Hashimoto 8698ebeff6 hosts/windows: use the port when connecting 2014-04-21 13:54:18 -07:00
Mitchell Hashimoto 5b960efcb1 commands/rdp: no need fo rthe guest cap 2014-04-21 13:54:17 -07:00
Mitchell Hashimoto 617cf630b1 commands/rdp: error if RDP info can't be detected 2014-04-21 13:54:16 -07:00
Mitchell Hashimoto 76a7c63f8b guests/windows: detect the port for RDP 2014-04-21 13:54:15 -07:00
Mitchell Hashimoto 7705ad76c6 guests/windows: use the public_address cap 2014-04-21 13:54:14 -07:00
Mitchell Hashimoto 993256643d guests/windows: rdp_info cap 2014-04-21 13:54:13 -07:00
Mitchell Hashimoto 0fa07637f9 commands/rdp: execute propre capabilities 2014-04-21 13:54:11 -07:00
Mitchell Hashimoto 746b568176 hosts/windows: rdp_client cap 2014-04-21 13:54:10 -07:00
Mitchell Hashimoto de7b4bbdc1 commands/rdp: basic skeleton 2014-04-21 13:54:09 -07:00
Mitchell Hashimoto 2929f7a853 provisoiners/chef: windows command builder 2014-04-21 13:54:08 -07:00
Mitchell Hashimoto 7022b1c29d provisioners/chef: command builder for Linux 2014-04-21 13:54:06 -07:00
Mitchell Hashimoto 909cda4bd1 provisioners/chef: reinit net shares on Windows guests 2014-04-21 13:54:05 -07:00
Mitchell Hashimoto 427d49402d provisioners/cfengine: fix typo 2014-04-21 13:54:04 -07:00
Mitchell Hashimoto 72030d2180 Note provisioners that don't work on Windows guests 2014-04-21 13:54:02 -07:00
Mitchell Hashimoto bd51c16700 provisioners/puppet: execute properly with WinRM 2014-04-21 13:54:00 -07:00
Mitchell Hashimoto 1a0cb9b4c1 privisioners/puppet: wait for reboot on Windows 2014-04-21 13:53:59 -07:00
Mitchell Hashimoto bec2cbbf4d provisioners/shell: check for winrm should be on machine config 2014-04-21 13:53:56 -07:00
Mitchell Hashimoto 4145aa6bcd privisioners/shell: wait for reboot if we can 2014-04-21 13:53:54 -07:00
Mitchell Hashimoto 4fc6fbeef6 privisioners/shell: fix syntax error 2014-04-21 13:53:53 -07:00
Mitchell Hashimoto 286fd2f2f8 provisioners/shell: friendly output if winrm shell provisioning 2014-04-21 13:53:52 -07:00
Mitchell Hashimoto bddc7928ad provisioner/shell: proper extension on temporary file 2014-04-21 13:53:50 -07:00
Mitchell Hashimoto 89671974cf provisioners/shell: handle comm output in a uniform way 2014-04-21 13:53:49 -07:00
Mitchell Hashimoto cde5d0bafb privisioners/shell: execute windows script 2014-04-21 13:53:48 -07:00
Mitchell Hashimoto aca8c4f8f3 provisioners/shelL: don't replace windows lineendings for WinRM 2014-04-21 13:53:47 -07:00
Mitchell Hashimoto 15fe061004 provisioners/shell: cause provision_winrm if winrm 2014-04-21 13:53:46 -07:00
Mitchell Hashimoto abd4185565 guests/freebsd: fix network name for vtnet 2014-04-21 13:53:45 -07:00
Mitchell Hashimoto 2057d513cb Update CHANGELOG 2014-04-21 13:53:44 -07:00
Maximilian Fischer a7b70dcf70 OpenBSD support for virtio interfaces
- When using KVM as provider you were not able to configure network
  interfaces that use virtio, because the interface name was strictly
  set to 'em'
2014-04-21 13:53:42 -07:00
Mitchell Hashimoto 96971194bc update CHANGELOG 2014-04-21 13:53:41 -07:00
Doug Stevenson cc343d1a7d Add config for FreeBSD guest plugin. Allow device to be configurable 2014-04-21 13:53:39 -07:00
Mitchell Hashimoto ba1676b232 providers/hyperv: fix tests and bug with usable? 2014-04-21 13:53:36 -07:00
Mitchell Hashimoto 1c29c39f1b core: generalize the autostart stuff so we don't have a bunch of specials 2014-04-21 13:53:35 -07:00
Mitchell Hashimoto d7a009f447 style 2014-04-21 13:53:34 -07:00
Mitchell Hashimoto 740652aef9 providers/hyperv: usable test 2014-04-21 13:53:09 -07:00
Mitchell Hashimoto 967f7bce1a providers/virtualbox: usability test 2014-04-21 13:53:08 -07:00
Mitchell Hashimoto f2bd6988b6 providers/docker: boxes are optional 2014-04-21 13:53:06 -07:00
Mitchell Hashimoto ab2cae2379 providers/docker: synced folder usable? raises error, tests
/cc @fgrehm
2014-04-21 13:53:05 -07:00
Mitchell Hashimoto 2e13feb130 providers/docker: Clean up config and make a spec 2014-04-21 13:53:04 -07:00
Mitchell Hashimoto 61ffa53134 kernel/v2: boxes can be optional if a provider says so
/cc @fgrehm - For the DOcker provider, we can now make boxes optional. :)
No more dummy boxes!
2014-04-21 13:53:03 -07:00
Mitchell Hashimoto 316aaa69fe kernel/v2: box setting should be new-style 2014-04-21 13:53:01 -07:00
Mitchell Hashimoto ac5a0cf326 commands/ssh-config: work without target into multi-machine env [GH-2844] 2014-04-21 13:52:59 -07:00
Mitchell Hashimoto 485422640e core: delete the preserve_order option so it doesn't invalidate 2014-04-21 13:52:31 -07:00
Mitchell Hashimoto aad8e7f80d core: provision "once" or "always" [GH-2421] 2014-04-21 13:52:30 -07:00
Mitchell Hashimoto f6fb9016a1 core: can specify a "post_up_message" [GH-1968] 2014-04-21 13:52:28 -07:00
Fabio Rehm e51c5530d7 providers/docker: Remove retryable around `docker run` as it seems that it is no longer needed 2014-04-21 13:51:48 -07:00
Fabio Rehm d705c48ef3 providers/docker: Implement public_address capability for `vagrant share` 2014-04-21 13:51:47 -07:00
Fabio Rehm c0aa05c62a providers/docker: Handle forwarded port collisions 2014-04-21 13:51:46 -07:00
Fabio Rehm e5375715ef providers/docker: Update driver to docker 0.9 2014-04-21 13:51:45 -07:00
Fabio Rehm de588ba82c providers/docker: Remove old README 2014-04-21 13:51:44 -07:00
Fabio Rehm 46cbeb38f0 providers/docker: Make use of Action::Builtin::IsState and remove provider specific actions 2014-04-21 13:51:42 -07:00
Fabio Rehm 29f2d9b09d providers/docker: Remove custom Action::Message 2014-04-21 13:51:41 -07:00
Fabio Rehm 15605b1a81 providers/docker: Switch to new HandleBox middleware 2014-04-21 13:51:39 -07:00
Fabio Rehm eaa4be8869 providers/docker: Remove Vagrant::Action shortcuts as we are on core now 2014-04-21 13:51:38 -07:00
Fabio Rehm c09ce4bbbd providers/docker: Add description 2014-04-21 13:51:37 -07:00
Fabio Rehm 87d2f35718 providers/docker: Get rid of some explicit requires in favor of autoloading 2014-04-21 13:51:35 -07:00
Fabio Rehm 3325bce2d0 providers/docker: Lazy load locales 2014-04-21 13:51:34 -07:00
Fabio Rehm 8c8826fe09 providers/docker: Get rid of vagrant version check from old plugin 2014-04-21 13:51:33 -07:00
Fabio Rehm e79df6caaa providers/docker: Move code out of lib dir so that Vagrant can pick it up 2014-04-21 13:51:32 -07:00
Fabio Rehm 5a60e568ce providers/docker: Import code from https://github.com/fgrehm/docker-provider with some initial tweaks 2014-04-21 13:51:31 -07:00
Fabio Rehm efc1122c42 provisioners/docker: Change to VagrantPlugins::DockerProvisioner namespace 2014-04-21 13:51:30 -07:00
Mitchell Hashimoto 47b5a3fcdb communicators/winrm: silence warnings loading winrm
/cc @sneal - I silenced warnings using the built-in util. Also, can you
see if we load here if that load error goes away?
2014-04-21 13:51:27 -07:00
Mitchell Hashimoto 9a16af10ad core: Use Machine#state wherever possible so we update the index 2014-04-21 13:51:23 -07:00
Mitchell Hashimoto e14216da4e commands/global-status: initial go at it 2014-04-21 13:51:22 -07:00
Mitchell Hashimoto 7ccf7fadf2 providers/virtualbox: make ID os-friendly for Windows 2014-04-21 13:51:12 -07:00
Mitchell Hashimoto a908b191b0 guests/windows: fix network configuring 2014-04-21 13:51:11 -07:00
Mitchell Hashimoto d600e83e6d guests/windows: configure networks 2014-04-21 13:51:09 -07:00
Mitchell Hashimoto d86a9ecade guests/windows: fix invalid templating 2014-04-21 13:51:08 -07:00
Mitchell Hashimoto b81f430f31 guests/windows: initial vagrant-windows extraction 2014-04-21 13:51:06 -07:00
Mitchell Hashimoto 7223e29330 communicators/winrm: fix powershell execution 2014-04-21 13:51:05 -07:00
Mitchell Hashimoto 21ac0810fd communicators/winrm: more tests 2014-04-21 13:51:04 -07:00
Mitchell Hashimoto bb9f0aef32 communicators/winrm: autodetect port based on forwarded ports 2014-04-21 13:51:03 -07:00
Mitchell Hashimoto 40d89cf5ea kernel/v2: configurable communicator (doesn't do anything yet) 2014-04-21 13:51:01 -07:00
Mitchell Hashimoto eebebd8837 communicators/winrm: Config unit tests (a little) 2014-04-21 13:50:59 -07:00
Mitchell Hashimoto 2a8a04ebb9 communicators/winrm: initial import from vagrant-windows 2014-04-21 13:50:58 -07:00
Ramon de la Fuente f6a5e20688 Add autostart as an option for vagrant boxes
Added specs for the environment and vagrantfile. Added a methd to retrieve
autostart_machine_names. Changed the plugin up/command to use autostart_machine_names
when no argument was given to the command.
2014-04-21 13:50:57 -07:00
Kenny Rasschaert fc95e77237 provisioners/salt: error if minion_config missing 2014-04-19 23:24:30 +02:00
Mitchell Hashimoto ceb90c5aac command/rsync-auto: proper require 2014-04-18 21:17:08 -07:00
Jing Chan 97c8919f26 Small fix to hyper-v provision action 2014-04-17 17:48:03 -04:00
Mitchell Hashimoto 7749b8fba4 providers/hyperv: provision action [GH-3494] 2014-04-17 13:59:13 -07:00
Nikhil Benesch ee5d8e2358 guests/linux: rsync chown if either user or group incorrect [GH-3485] 2014-04-15 16:55:49 -04:00
Mitchell Hashimoto d0b0d5635c provisioners/docker: debian install should apt-get update 2014-04-15 13:04:07 -07:00
Mitchell Hashimoto 544f404037 provisioners/docker: configure autostart works if OS can't check status 2014-04-15 12:18:37 -07:00
Mitchell Hashimoto ac8d54132b provisioners/docker: UPDATE CHANGELOG 2014-04-15 12:15:14 -07:00
Henry Hsu 91555d0a86 Fixes not enough time for docker restart before continuing on to next
provisioning step
2014-04-15 11:32:05 -07:00
Mitchell Hashimoto 20473fe4ca core: allow overriding default SSH port [GH-3474] 2014-04-15 10:37:08 -07:00
Mitchell Hashimoto ae8be9356e commands/box/update: show current version [GH-3467] 2014-04-14 18:55:22 -07:00
Mitchell Hashimoto 0fc7d59222 guests/coreos: fix test for docker daemon running 2014-04-14 17:01:00 -07:00
Mitchell Hashimoto 8a9bbdb71a provisioners/docker: fix linux cap for daemon running 2014-04-14 17:00:12 -07:00
Mitchell Hashimoto 88683221f4 synced_folders/rsync: force NIO4R_PURE 2014-04-14 10:18:50 -07:00
Mitchell Hashimoto 00962c7c2a commands/box/repackage: better error if box not found 2014-04-12 18:00:33 -07:00
Mitchell Hashimoto adca39b471 commands/box/repackage: works with new stuff [GH-3372] 2014-04-12 17:57:51 -07:00
Mitchell Hashimoto 77c286f1af Merge pull request #3452 from berendt/box_update_sort_versions
command/box/update: update from latest version
2014-04-12 15:25:22 -07:00
Gilles Cornu 7ed17ae9ed provisioners/ansible: use strict boolean options
With this change, the ansible provisioner fully complies with
the current user documentation.
2014-04-12 13:48:15 +02:00
Christian Berendt 764c007a93 When there are multiple versions of a box are available it should be checked if an update is available for the highest version.
Example:

There are version 0.2.10 and 0.2.11 available. The latest update is version 0.2.12.

```
berendt/ubuntu-14.04-amd64          (virtualbox, 0.2.10)
berendt/ubuntu-14.04-amd64          (virtualbox, 0.2.11)
```

Without this patch it will be checked if a higher version than 0.2.10 is available.

```
Checking for updates to 'berendt/ubuntu-14.04-amd64'
Version constraints: > 0.2.10
Provider: virtualbox
Updating 'berendt/ubuntu-14.04-amd64' with provider 'virtualbox' from version
'0.2.10' to '0.2.12'...
Loading metadata for box 'https://vagrantcloud.com/berendt/ubuntu-14.04-amd64'
Adding box 'berendt/ubuntu-14.04-amd64' (v0.2.12) for provider: virtualbox
Downloading: https://vagrantcloud.com/berendt/ubuntu-14.04-amd64/version/23/provider/virtualbox.box
Successfully added box 'berendt/ubuntu-14.04-amd64' (v0.2.12) for 'virtualbox'!
```

with this patch it will be checked if a higher version than 0.2.11 is available (the expected behaviour).

```
Checking for updates to 'berendt/ubuntu-14.04-amd64'
Version constraints: > 0.2.11
Provider: virtualbox
Updating 'berendt/ubuntu-14.04-amd64' with provider 'virtualbox' from version
'0.2.11' to '0.2.12'...
Loading metadata for box 'https://vagrantcloud.com/berendt/ubuntu-14.04-amd64'
Adding box 'berendt/ubuntu-14.04-amd64' (v0.2.12) for provider: virtualbox
Downloading: https://vagrantcloud.com/berendt/ubuntu-14.04-amd64/version/23/provider/virtualbox.box
Successfully added box 'berendt/ubuntu-14.04-amd64' (v0.2.12) for 'virtualbox'!
```
2014-04-12 11:03:04 +02:00
Mitchell Hashimoto 1144217e2d Merge pull request #3436 from gildegoma/ansible-inventory-path
provisioners/ansible: refer to directory that contains the generated inventory file
2014-04-11 21:16:14 -07:00
Mitchell Hashimoto 374d1c495a provisioners/docker: auto-assigned name shouldn't have / [GH-3216] 2014-04-11 18:50:02 -07:00
Mitchell Hashimoto ad8d133293 communicators/ssh: throttle warnings [GH-3442] 2014-04-11 16:17:17 -07:00
Mitchell Hashimoto e972bbf32a synced_folders/rsync: change wording on no paths watching 2014-04-11 14:56:35 -07:00
Mitchell Hashimoto 75bc1c74b6 Merge pull request #3446 from brenttheisen/rsync_auto_nothing_to_watch_pr
command/rsync-auto: message and exit rsync-auto immediately if there is nothing to watch.
2014-04-11 14:53:42 -07:00
Brent Theisen 7b27fa31ce Print message and exit rsync-auto immediately if there is nothing to watch. 2014-04-11 16:49:58 -05:00
Mitchell Hashimoto 77c92d0d11 communicators/ssh: only show warnings after a few attempts [GH-3442] 2014-04-11 14:36:19 -07:00
Gilles Cornu 0098b7604d provisioners/ansible: refer to inventory directory
By referring the directory that contains the generated inventory file,
users can easily provide more settings with additional files stored in
the same directory.
2014-04-11 08:20:32 +02:00
Mitchell Hashimoto b97c509c15 Remove this, supposed to be in vagrant-next 2014-04-10 13:43:15 -07:00
Mitchell Hashimoto f47213f9b2 guests/coreos: docker_daemon_running cap [GH-3425] 2014-04-10 13:42:12 -07:00
Mitchell Hashimoto 541ebd8935 kernel/v2: clear ID field so its not passed to provisioner [GH-3424] 2014-04-10 08:42:11 -07:00
Mitchell Hashimoto e5d1d681d9 Update CHANGELOG 2014-04-09 14:17:51 -07:00
Bernhard Morgenstern 247a2470c0 Fixed error with empty shell provisioner
`read` returns nil on empty files, so the call to `valid_encoding` fails.
2014-04-09 22:56:15 +02:00
Mitchell Hashimoto 9529dd8cde guests/linux: rsync chown group if owner now set [GH-3223] 2014-04-09 11:03:24 -07:00
Mitchell Hashimoto b20ff91784 guests/linux: SMB mounts with symbol passwords work [GH-3202] 2014-04-09 10:46:56 -07:00
Mitchell Hashimoto a6725710d3 guests/linux: don't show SMB password in plaintext on error [GH-3203] 2014-04-09 10:42:39 -07:00
Mitchell Hashimoto 83c38b9278 command/rsync-auto: use newer listen gem [GH-3249] 2014-04-09 09:48:11 -07:00
Mitchell Hashimoto c02eae2279 providers/hyperv: verify cmdlet is available [GH-3398] 2014-04-09 09:30:17 -07:00
Mitchell Hashimoto 09a3409746 commands/rsync-auto: do an initial sync [GH-3327] 2014-04-09 09:09:42 -07:00
Mitchell Hashimoto 800cf7539b synced_folders/rsync: don't crash if comm error during rsync-auto [GH-3419] 2014-04-09 08:58:56 -07:00
timcooper 1c12609fdb Encapsulate path for smb powershell script 2014-04-07 17:45:29 +01:00
timcooper 902202aad9 Fixed typo in smb errors on error_key call 2014-04-07 17:21:24 +01:00
Mitchell Hashimoto e46f8925bb Merge pull request #3382 from ndemonner/fix-fedora
guests/fedora: fix hostname setting
2014-04-05 09:09:39 -07:00
Mitchell Hashimoto e04ef90b3a Merge pull request #3207 from khiro/support_fedora_predictable_network_interface_names
guests/fedora: Fix a network configuration issue of Fedora [GH-1997]
2014-04-05 09:08:08 -07:00
Mitchell Hashimoto bb967265df synced_folders/rsync: style 2014-04-05 09:05:39 -07:00
Steffen Müller 32f25b6a0d synced_folders/rsync: enable override of default chmod flag
fixed new file creation to follow guest's umask on Windows by default
2014-04-05 11:11:55 +02:00
Nick DeMonner 65ce0ebe97 Fix hostname change 2014-04-04 07:20:17 -07:00
Nick DeMonner b240d40303 Merge branch 'support_fedora_predictable_network_interface_names' of https://github.com/khiro/vagrant into fix-fedora 2014-04-04 07:17:45 -07:00
Mitchell Hashimoto d1caf8c624 core: Allow direct box adding again 2014-04-02 19:45:49 -07:00
Mitchell Hashimoto 3302bd535f kernel/v2: check if type is set before validation 2014-04-02 15:19:36 -07:00
Mitchell Hashimoto a1d9121852 synced_folders/smb: verify PowerShell v3 is running or later [GH-3257] 2014-04-02 09:45:42 -07:00
Mitchell Hashimoto 2e0142168e synced_folders/rsync: set chmod flag by default on Windows [GH-3256] 2014-04-02 09:07:00 -07:00
Mitchell Hashimoto 4f5d5fbc9b Merge pull request #3292 from skinofstars/master
hosts/linux: don't hard code exportfs path
2014-04-01 22:32:08 -07:00
Mitchell Hashimoto cc99719717 Merge pull request #3293 from emyl/machine-readable-plugin-list
Add machine readable output for `vagrant plugin list` command
2014-04-01 22:29:21 -07:00
Mitchell Hashimoto d45eb1f183 commands/box: show version 2014-04-01 22:04:49 -07:00
Mitchell Hashimoto e7277f5e83 Merge pull request #3316 from berendt/issue_3313
commands/box: display version by default when listing boxes
2014-04-01 22:04:08 -07:00
Mitchell Hashimoto a74a57ddf6 Merge pull request #3323 from mattoxbeckman/fix/master/reload-arch-udev-rules
guests/arch: Fix for issue #3322, a followup to issue #2591.
2014-04-01 22:01:12 -07:00
Mitchell Hashimoto 18658fc6fb Merge pull request #3337 from MSOpenTech/fix-issue-3336
providers/hyperv: HyperV provider resume. GH-3336
2014-04-01 21:58:33 -07:00
Mitchell Hashimoto 84f7c019f9 kernel/v2: allow private network type to be a string [GH-3349] 2014-04-01 21:57:23 -07:00
Mitchell Hashimoto d337890f1a Merge pull request #3354 from Coffee-fan/master
synced_folders/smb: properly remove shares
2014-04-01 21:53:44 -07:00
Mitchell Hashimoto 188d3c394f Merge pull request #3355 from miurahr/fix_ssh_utf8
core: force SSH to be ASCII
2014-04-01 21:52:39 -07:00
Mitchell Hashimoto 9fc2c717a2 Merge pull request #3356 from pmenglund/docker_deprecated_arguments
provisioners/docker: fix deprecated docker arguments
2014-04-01 21:51:24 -07:00
Mitchell Hashimoto d2056863de Merge branch 'fix-suse-shutdown-not-found' of github.com:philippfranke/vagrant into philippfranke-fix-suse-shutdown-not-found
Conflicts:
	CHANGELOG.md
2014-04-01 21:50:32 -07:00
Oscar Renalias 8f4ae68f56 Fixes mitchellh/vagrant #3361 for VirtualBox 4.2.x, including internal networks 2014-03-31 21:32:12 +03:00
Oscar Renalias 094be9dc50 Fixes mitchellh/vagrant #3361 for VirtualBox 4.3.x, including internal networks 2014-03-31 21:31:51 +03:00
Oscar Renalias cd6f24b2d9 Fixes mitchellh/vagrant #3361 for VirtualBox 4.2.x 2014-03-31 20:36:24 +03:00
Oscar Renalias 0314453f46 Fixes mitchellh/vagrant #3361 for VirtualBox 4.3.x 2014-03-31 20:36:16 +03:00
Philipp Franke 5180f4b647 guests/suse: fix error on shutdown 2014-03-30 18:28:23 +02:00
Martin Englund 53194f8e12 fix deprecated docker arguments 2014-03-29 22:49:52 -07:00
Hiroshi Miura a7cc402258 vagrant ssh accept utf8, fix #2744
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2014-03-30 12:15:53 +09:00
Pierre Jacomet 4d4c85b944 Fix for HyperV provider fails when recreating shares on Vagrant reload #3353 2014-03-29 18:15:24 -07:00
Ramakrishnan 41e1a7e0e4 HyperV provider resume. GH-3336
Fix for vagrant resume command for HyperV provider. Fixed the variable
name in action builder block.
2014-03-27 13:04:28 +05:30
Mattox Beckman 17a3dff77f This is a followup to issue #2591.
Arch linux will rename its eth0 device unless an empty file is placed in `/etc/udev/rules.d/`.
In order for the new rules to take effect, we need call `udevadm control --reload`.
2014-03-25 20:44:42 -05:00
Christian Berendt 50bf36e747 display version by default when listing boxes
example usage:

$ vagrant box list
berendt/ubuntu-14.04-amd64 (virtualbox) [0.1.3]
berendt/ubuntu-14.04-amd64 (virtualbox) [0.1.4]
berendt/ubuntu-14.04-amd64 (virtualbox) [0.1.5]

related to issue #3313
2014-03-25 18:45:13 +01:00
Emiliano Ticci 08e7a76962 Add machine readable output for `vagrant plugin list` command 2014-03-23 13:09:16 +01:00
Kevin Carmody 17c171559f Update nfs.rb
Make call to exportfs just use the system path.
2014-03-22 21:07:45 +00:00
Mitchell Hashimoto f7adeadf8d communicators/ssh: change wording on retry 2014-03-21 17:48:03 -07:00
Mitchell Hashimoto d4b3f226dd providers/virtualbox: fix missing interpolation [GH-3277] 2014-03-20 17:57:17 -07:00
Mitchell Hashimoto 9fc5540841 guests/debian: don't return from block [GH-3283] 2014-03-20 17:52:31 -07:00
Mitchell Hashimoto 600d01d792 Merge pull request #3102 from sax/smartos
guests/smartos
2014-03-20 17:50:20 -07:00
Mitchell Hashimoto aaee1058e3 Merge pull request #3272 from pbitty/fix_provision_config
core: allow provisioner plugins to register without config
2014-03-20 17:42:12 -07:00
Mark Harrison 43f732b32d Add mount_nfs_folder capability to omnios guests
Refs issue #3280
2014-03-20 17:06:49 -04:00
Paulo Bittencourt 1f694d4978 kernel/v2: allow provisioner plugins to register without config 2014-03-19 17:37:52 -04:00
Mitchell Hashimoto 30f6c7ba60 Merge pull request #3242 from uwej711/patch-1
synced_folders/smb work for non-english windows
2014-03-19 09:31:06 -07:00
Andy Clarke 26e0c85488 Fix SMB shared folder mount error with password containing symbols. 2014-03-17 17:38:34 -04:00
Uwe Jäger 3dd03d7efc Make shared folder type smb work for non-english windows
the grant "Everyone,Full" does not work on localized versions of windows, in German it is "Jeder" in Spanish "Todos". Also the net share command returns localized texts, so the -Match does not work for non-english Windows. 

I could not test exactly that version, copied relevant bits from my modified lokal version.
2014-03-17 15:11:45 +01:00
Mitchell Hashimoto b6cd952fc4 commands/status: target for machine readable [GH-3218] 2014-03-14 13:05:24 -07:00
Mitchell Hashimoto 862d9315ce synced_folders/smb: hash ID so it is short enough [GH-3219] 2014-03-14 13:03:11 -07:00
khiro 9edb299c0d Fix a network configuration issue of Fedora [GH-1997]
Support Predictable Network Interface Names.
2014-03-14 15:12:51 +09:00
Mitchell Hashimoto ca00ad8257 guests/linux: one more time 2014-03-13 09:48:53 -07:00
Mitchell Hashimoto 3c02caf811 guests/linux: check for proper owner [GH-3186] 2014-03-13 09:48:22 -07:00
Mitchell Hashimoto 00d73eabda guests/linux: rsync only chown if invalid user/group [GH-3186] 2014-03-13 09:47:34 -07:00
Mitchell Hashimoto 012c28606f kernel/v2: validate forwarded ports [GH-3187] 2014-03-13 08:32:05 -07:00
Eric Saxby f36d372b32 Resolve confusion around SmartOS rsync_pre
rsync should *always* be pre-installed in SmartOS (global and local zones), as
it's part of the kernel. Previous commits incorrectly attributed #rsync_install
to running rsync, rather than to installing the rsync command.
2014-03-12 22:35:32 -07:00
Mitchell Hashimoto b0f8d050f0 provisioners/salt: style nitpicks 2014-03-12 20:04:57 -07:00
Mitchell Hashimoto a8fa2d5ffe providers/virtualbox: import progress works on Windows 2014-03-12 20:02:05 -07:00
Mitchell Hashimoto 56dd0e8531 synced_folders/rsync: don't watch excluded paths [GH-3159] 2014-03-12 19:40:18 -07:00
Mitchell Hashimoto a6eafd6a12 synced_folders/rsync: execute rsync_post cap if it exists [GH-3163] 2014-03-12 18:43:59 -07:00
Mitchell Hashimoto ec0234349a Merge pull request #3167 from xraj/bugfix/linux-nfs-exports-regex
hosts/linux: Fix Linux NFS exports pruning due to bad `sed` expression
2014-03-12 18:36:58 -07:00
cuberri 5ef0d881d0 add rsync_install capability to tinycore guest 2014-03-13 01:41:52 +01:00
Russell Jackson a3c94ab910 Fix Linux NFS exports pruning due to bad `sed` expression
The mount id is a file path which will contain forward slashes. A
previous attempt (although notably missing in the Linux host plugin) at
fixing this used `String.gsub` to escape the forward slashes; however,
the solution that eventually made its way into the 1.5 release uses
`Regexp.escape` which doesn't escape forward slashes.

The Ruby `Regexp.escape` method does not escape forward slashes because
they are not RE meta-characters; their special meaning is specific to
sed expressions as delimiters. To avoid the issue entirely, we can use
an alternative delimiter by prefixing the address expression with a
backslash with the desired delimiter character following.

Use control character (ASCII code point `0x01`) as expression delimiter
so it is very unlikely an identifier will have a conflicting character
within it.
2014-03-12 12:25:53 -07:00
Mitchell Hashimoto 8172fbbd6d Merge branch 'patch-1' of https://github.com/schlamar/vagrant into schlamar-patch-1
Conflicts:
	CHANGELOG.md
2014-03-12 08:45:35 -07:00
Marc Schlaich 5694c7dc2f providers/virtualbox: retry list vms [GH-2831] 2014-03-12 16:23:32 +01:00
Matt Way 16d093dc8a use global namespace for class IO naming conflict 2014-03-12 07:52:11 -04:00
Mitchell Hashimoto 32adbf9e58 Merge pull request #3112 from Krazylee/fix-typo
core: fix timout typo
2014-03-11 09:30:53 -07:00
Mitchell Hashimoto 24d8067c7b Merge pull request #3126 from bbinet/fix-salt-provisioning
provisioners/salt: allow master key with no minion key
2014-03-11 09:05:50 -07:00
Mitchell Hashimoto 5a3a501455 provisioners/ansible: request SSH info within provisoin [GH-3111] 2014-03-11 09:03:23 -07:00
Mitchell Hashimoto 0f70ce7e46 providers/virtualbox: style nitpick 2014-03-11 08:48:33 -07:00
Bruno Binet 9625957203 Fix salt provisioning validation
(mismatch between minion/master)
2014-03-11 15:18:24 +01:00
krazyLee fb4cb4636e fix timout typo 2014-03-11 17:27:47 +08:00
Eric Saxby 330642fa42 Smartos guest capabilities includes rsync_pre 2014-03-11 01:25:08 -07:00
Eric Saxby 31da3860e5 Add unit tests for smartos compatibility 2014-03-10 18:52:20 -07:00
Mitchell Hashimoto 171b7c76d7 kernel/v1: provisioner upgrade works properly [GH-3092] 2014-03-10 13:44:24 -07:00
Eric Saxby a0fee69d04 Add SmartOS detection and mount plugins 2014-03-10 11:52:55 -07:00
Mitchell Hashimoto 6a5fee0191 providers/virtualbox: add post-comm customize step [GH-3080] 2014-03-09 21:35:53 -07:00
Mitchell Hashimoto 04a19e05ca synced_folders/rsync: convert to proper unix-style path [GH-3086] 2014-03-09 18:22:00 -07:00
Gilles Cornu 1d09fc4a79 provisioners/ansible: add new option raw_ssh_args
Since the Ansible provisioner now potentially exports ANSIBLE_SSH_ARGS
variable, it is fair to allow to extend the content of this environment
variable (`ssh_args` parameters from ansible.cfg file have lower
priority)
2014-03-09 22:47:24 +01:00
Gilles Cornu 1c0bc20d21 Ansible: Re-enable ControlPersist defaults when ANSIBLE_SSH_ARGS is used
Solve problem discussed in [GH-2952]
2014-03-09 22:41:36 +01:00
Mitchell Hashimoto fa537740c6 provisioners/shell: use detail level output for running 2014-03-08 14:43:35 -08:00
Mitchell Hashimoto 4c9e6e46b2 provisioners/salt: don't use exteranl deep_merge [GH-2348] 2014-03-07 09:18:34 -08:00
Mitchell Hashimoto 686786a4c2 Merge pull request #3073 from gildegoma/ansible-fixes
provisioners/ansible: Disable host key checking by default
2014-03-06 21:35:25 -08:00
Gilles Cornu 1d328f7021 provisioners/ansible: Disable host key checking
Close #3060
2014-03-06 23:55:08 +01:00
Mitchell Hashimoto cf5528b813 providers/hyperv: ssh_info doesn't need a dedicated action stack 2014-03-06 12:27:05 -08:00
Mitchell Hashimoto c8e02ddd78 synced_folders/rsync: rsync__auto options 2014-03-06 12:18:13 -08:00
Mitchell Hashimoto d4511131b4 synced_folders/rsync: allow custom args [GH-3070] 2014-03-06 11:27:58 -08:00
Mitchell Hashimoto 75754019a9 providers/hyperv: fix the class name 2014-03-06 11:01:52 -08:00
Mitchell Hashimoto 074ea02b82 providers/hyperv: public_address cap 2014-03-06 11:01:19 -08:00
Mitchell Hashimoto 1ccedcd2cb providers/hyperv: update driver stuff 2014-03-06 08:58:31 -08:00
Mitchell Hashimoto d1dc010073 Merge pull request #3068 from MSOpenTech/driver-methods
provider/hyperv: move to Driver based model
2014-03-06 08:52:01 -08:00
Mitchell Hashimoto c9623a2a3f synced_folders/smb: ask for creds in prepare 2014-03-06 08:49:41 -08:00
Mitchell Hashimoto 46b5f0d22b synced_folders/smb: set recursive ACL for folders 2014-03-06 08:30:04 -08:00
Mitchell Hashimoto 0037d2c767 providers/hyperv: validate IP address returned [GH-3069] 2014-03-06 07:35:46 -08:00
Mitchell Hashimoto 35adc6063b providers/hyperv: add test for windows guests 2014-03-05 18:50:31 -08:00
Mitchell Hashimoto cae4a1c554 guests/redhat: force remove files so it works with pty 2014-03-05 16:22:55 -08:00
Mitchell Hashimoto ada5e8bf7f provisioners/docker: actual auto assign name logic 2014-03-04 07:32:25 -08:00
Mitchell Hashimoto 857b989c47 provisioners/docker: setting to not auto assign name 2014-03-04 07:31:13 -08:00
Mitchell Hashimoto f333b00f91 Merge pull request #3051 from mattes/patch-1
provisioners/docker: set param -name automatically (docker run)
2014-03-04 07:27:19 -08:00
Mitchell Hashimoto 5db58d6a33 commands/plugin: list notes system gems 2014-03-03 14:57:42 -08:00
Matthias Kadenbach 8f76d5e2cd added as ``args << `` 2014-03-03 16:30:42 +01:00
Matthias Kadenbach f6db54b2dc Set param -name automatically (docker run)
``-name`` ist needed for linking containers, i.e. see http://docs.docker.io/en/latest/use/working_with_links_names/#working-with-links-names
2014-03-03 14:20:33 +01:00
Mitchell Hashimoto 179a9244df Merge pull request #3043 from mitchellh/f-hyperv
Hyper-V and SMB
2014-02-28 21:37:05 +01:00
Mitchell Hashimoto 9120339dc7 providers/hyperv: set the hostname 2014-02-28 18:58:41 +01:00
Gilles Cornu cf8bfb2347 Ansible: Refactor handling of SSH vars/attributes
Avoid repetitions by using (sometimes lazy loaded) instance attributes
2014-02-28 09:07:52 +01:00
Gilles Cornu db490c5da5 Ansible: force 'ssh' connection only when needed
Remain in 'smart' mode, unless Multiple SSH identities or SSH-Forwarding
are in use.
2014-02-28 09:07:51 +01:00
Bryan Hunt 9480edf05a Ansible: Support SSH-Forwarding
Credits: Problem was originally reported in
dba02f3526
by @picsolvebryan
2014-02-28 09:07:51 +01:00
Gilles Cornu ca1e30d405 Ansible: Support multiple private keys
Note that this feature requires to force `--connection=ssh`. This is not
a big deal as `paramiko` mode is deprecated and in most cases `smart`
mode enables `ssh` mode.
2014-02-28 09:07:51 +01:00
Gilles Cornu a62d28fd7f provisioners/ansible: remove an unused variable
Sorry, I missed that point in GH-2991 review.

[ci skip]
2014-02-28 09:00:05 +01:00
Mitchell Hashimoto a1b29ca82b Merge pull request #2991 from gildegoma/review-pr2926
provisioner/ansible: Ansible single inventory file
2014-02-27 11:30:12 -08:00
Mitchell Hashimoto 1724d499dc synced_folders/smb: higher priority than things like NFS and rsync 2014-02-27 08:13:39 -08:00
Mitchell Hashimoto 729f0f5db8 providrs/hyperv: ask for the vswitch to use 2014-02-27 08:13:18 -08:00
Mitchell Hashimoto 3ddc63c88f providers/hyperv: add script to read switches 2014-02-27 08:13:17 -08:00
Mitchell Hashimoto da58f7bdc0 providers/hyperv: remove bad reference to file 2014-02-27 08:13:16 -08:00
Mitchell Hashimoto bdcb92ed07 providers/hyperv: disable parallelism 2014-02-27 08:13:15 -08:00
Mitchell Hashimoto 39bf9db651 providers/hyperv: remove unused config 2014-02-27 08:13:15 -08:00
Mitchell Hashimoto d1bdfe492b providers/hyperv: style 2014-02-27 08:13:14 -08:00
Mitchell Hashimoto af4bc18c14 providers/hyperv: use IsState and Message built-ins everywhere 2014-02-27 08:13:13 -08:00
Mitchell Hashimoto e93038fd0e providers/hyperv: suspend/resume 2014-02-27 08:13:11 -08:00
Mitchell Hashimoto ef71729c24 providers/hyperv: remove nonexistent action 2014-02-27 08:13:10 -08:00
Mitchell Hashimoto 760f3d9b7b providers/hyperv: that synced folder stuff can go 2014-02-27 08:13:09 -08:00
Mitchell Hashimoto 41bc86c490 providers/hyperv: clean up provider since we moved out SMB 2014-02-27 08:13:08 -08:00
Mitchell Hashimoto dd6f1083b0 synced_folders/smb: test for admin privileges 2014-02-27 08:13:07 -08:00
Mitchell Hashimoto a50421c54c synced_folders/smb: raise error if not windows 2014-02-27 08:13:06 -08:00
Mitchell Hashimoto 0fe4a4af26 synced_folders/smb: basically working 2014-02-27 08:13:05 -08:00
Mitchell Hashimoto 31abc3f4a3 providers/hyperv: fix file format to unix 2014-02-27 08:13:04 -08:00
Mitchell Hashimoto ea871ec9ef providers/hyperv: change wording to look a bit better 2014-02-27 08:13:03 -08:00
Mitchell Hashimoto 4c810a879a providers/hyperv: clone the disk 2014-02-27 08:13:02 -08:00
Mitchell Hashimoto d8e4482f2c providers/hyperv: enable provisioning 2014-02-27 08:13:01 -08:00
Mitchell Hashimoto d4ec3b5dfc providers/hyperv: reset machine ID if machine deleted outside 2014-02-27 08:13:00 -08:00
Mitchell Hashimoto faf906c057 providers/hyperv: wait for communicator on boot 2014-02-27 08:12:59 -08:00
Mitchell Hashimoto 9fa4549105 providers/hyperv: remove unused var 2014-02-27 08:12:58 -08:00
Mitchell Hashimoto 5d19285774 providers/hyperv: wait for IP on boot 2014-02-27 08:12:57 -08:00
Mitchell Hashimoto 64abd95c6f providers/hyperv: use HandleBox middleware 2014-02-27 08:12:57 -08:00
Mitchell Hashimoto 27688a183b providers/hyperv: destroy 2014-02-27 08:12:56 -08:00
Mitchell Hashimoto 7c0948c81d providers/hyperv: clean up status script 2014-02-27 08:12:55 -08:00
Mitchell Hashimoto 88247797d4 providers/hyperv: more cleanup 2014-02-27 08:12:54 -08:00
Mitchell Hashimoto fe93b0d2a5 providers/hyperv: more checks on machine import 2014-02-27 08:12:53 -08:00
Mitchell Hashimoto 784a5b2e32 providers/hyperv: all sorts of tests to verify Windows/admins 2014-02-27 08:12:51 -08:00
Mitchell Hashimoto ab4390eb67 providers/hyperv: clean up driver error handling quite a bit 2014-02-27 08:12:51 -08:00
Mitchell Hashimoto fb7dd73d95 providers/hyperv: better errors 2014-02-27 08:12:49 -08:00
Mitchell Hashimoto a1958ee12f providers/hyperv: shuffle things around 2014-02-27 08:12:48 -08:00
Mitchell Hashimoto 3d8971b15f providers/hyper-v: cleanup 2014-02-27 08:12:47 -08:00
Mitchell Hashimoto ca24d60d8f providers/hyperv: initial commit
Initial work done by MS Open Tech
2014-02-27 08:12:46 -08:00
Mitchell Hashimoto 6b17783688 synced_folders/nfs: unavailable on Windows 2014-02-27 08:11:50 -08:00
Mitchell Hashimoto c877fc27a7 communicators/ssh: call ready? when waiting
This lets things like the SSH key go in
2014-02-26 11:35:41 -08:00
Mitchell Hashimoto d14f3e0a56 hosts/bsd: make directories unique when exporting 2014-02-26 08:04:21 -08:00
Mitchell Hashimoto 12c740898c provisioners/puppet: append module path (default) [GH-2677] 2014-02-24 08:09:24 -08:00
Mitchell Hashimoto 32c45aa70b Revert "Merge pull request #2677 from purpleidea/fix_puppet_apply"
This reverts commit 9ac4ec85dd, reversing
changes made to 8dbad22d72.
2014-02-24 08:07:57 -08:00
Mitchell Hashimoto 6c5179602c provisioners/salt: error if minion_config missing [GH-2893] 2014-02-24 07:58:12 -08:00
Gilles Cornu 1cd2fe56a0 ansible: generate inventory in .vagrant/... 2014-02-24 16:52:38 +01:00
Mitchell Hashimoto 7abcea35b8 hosts/linux: escape regular expression for prune NFS exports [GH-2934] 2014-02-24 07:51:06 -08:00
Mitchell Hashimoto 67a0d3d5f1 communicators/ssh: rescue/show correct error messages 2014-02-23 22:31:37 -08:00
Mitchell Hashimoto 3324756e12 providers/virtualbox: don't log in trap context 2014-02-23 22:09:15 -08:00
Mitchell Hashimoto a667893cbf provisioners/shell: error if invalid encoding [GH-3000] 2014-02-23 21:50:53 -08:00
Mitchell Hashimoto 5ebe007ddc Merge pull request #3005 from ajw0100/fix-salt-options-error
provisioners/salt: Fix "options are only allowed before install arguments" error.
2014-02-23 21:25:42 -08:00
Jon Topper 7b30e557cd hosts/bsd: sort NFS exports to avoid false validation errors [GH-2927]
With a synced folder configuration like so:

 synced_folder ".", "/vagrant", :nfs => true
 synced_folder "#{ENV['HOME']}/mirror", "/mirror", :nfs => true
 synced_folder ENV['HOME'], "/home/#{ENV['USER']}", :nfs => true

on OSX, vagrant writes two overlapping exports to /etc/exports
which then fail the export check.

Iterating through the list of folders lexically builds a correct, single
exports entry.

Signed-off-by: Teemu Matilainen <teemu.matilainen@iki.fi>
2014-02-21 23:43:11 -03:00
Teemu Matilainen 7d90191212 provisioners/chef: DRY up `environment` and `node_name` configuration 2014-02-21 23:28:46 -03:00
Teemu Matilainen 24f7d7b9eb Merge pull request #2975 from shanegibbs/chef-solo-role-path
Add support for multiple role paths in chef-solo >= 11.8.0
2014-02-21 23:58:10 -02:00
A.J. Welch 9f0efc19a9 Fix "options are only allowed before install arguments" error.
This reverts feb748f488 and 7cd7077467. `bootstrap_options` is
meant for flag options such as `-D`. This is demonstrated in the
example Vagrantfile from the original plugin:
github.com/saltstack/salty-vagrant/blob/develop/example/complete/Vagrantfile
Flag options must be appended to the options string before install
args such as `install_type` and `install_args`.
2014-02-19 20:24:05 -08:00
Teemu Matilainen 807c879ac8 Merge pull request #2845 from tmatilai/chef_data_bag_secret
provisioners/chef: DRY and unify encrypted data bag secret handling
2014-02-19 00:54:57 -02:00
Mitchell Hashimoto 75dcc828ad kernel/v2: fix error where options could be not hash 2014-02-18 10:41:14 -08:00
Teemu Matilainen eea9c07029 provisioners/chef: set `encrypted_data_bag_secret` to `nil` if it's not uploaded
/cc @shanegibbs

Fixes #2984
2014-02-16 18:14:56 -03:00
Gilles Cornu 709f3f4e6f provisioners/ansible: Change --limit behaviours
- The implicit default limit is always set
- ansible.limit as an empty string won't disable the default limit, but
  will be passed as "--limit=" argument and ansible-playbook will return
  an error (provided host list is empty)
2014-02-16 11:39:15 +01:00
Gilles Cornu c2663f5d30 provisioners/ansible: Fix Group Management
- Support arbitrary depth of "groups of groups of ... groups"
- Skip ':vars' suffix, but allow group names with ':' (yes, Ansible
  accepts this character)
- Like for groups of machines, groups of groups can result "empty", but
  it is not an issue for Ansible. Recursive filter on the group tree is
  a bit hard to implement, and don't brind real added value at Vagrant
  level.
2014-02-16 11:20:00 +01:00
Teemu Matilainen ad34d474bc provisioners/chef: DRY and unify encrypted data bag secret handling
Pull up encrypted data bag secret management into the base classes, thus
also unifying the functionality.

Especially this complements the issues:
  * Upload the secret to provisioning path also with chef-solo [GH-1246]
  * Delete the secret also with chef-client [GH-2712]
  * Remove the secret before uploading also with chef-client [GH-1111]
2014-02-15 22:46:48 -03:00
Eugene Ware 85d2f24607 more robust coreos checking 2014-02-15 15:50:11 +11:00
Eugene Ware 2d01691e0a detect latest version of coreos 2014-02-15 15:03:06 +11:00
Mitchell Hashimoto 8c9fde41e9 provisioners/shell: clean up fixnum handling 2014-02-14 12:43:27 -08:00
Ryan Uber 509e29043a Added handling of fixnum values for shell provisioner options both as the value
of `args` itself and as an element inside of an `args` array. Added validation
around passing in arrays for arguments. Just knowing that it is an array is not
enough, because arrays can contain any other type.
2014-02-14 11:47:36 -08:00
Shane Gibbs 5600bd1067 Add support for multiple role paths in chef-solo 2014-02-14 21:48:18 +13:00
Mitchell Hashimoto d0cd2464b2 providers/virtualbox: only clear forwarded ports if there are any 2014-02-13 21:04:56 -08:00
Mitchell Hashimoto 2fe2fe79ed communicators/ssh: properly allow errors through while waiting 2014-02-13 21:04:41 -08:00
Mitchell Hashimoto ed5e544e63 communicators/ssh: more verbose output about waiting for SSH 2014-02-13 20:59:26 -08:00
Mitchell Hashimoto 14b27ae215 communicators/ssh: cache ssh_info
This lowers the number of subprocesses with VirtualBox quite a bit.
2014-02-13 20:34:51 -08:00
Mitchell Hashimoto b1bed68bed providers/virtualbox: cap to read forwarded ports 2014-02-13 16:34:34 -08:00
Mitchell Hashimoto e909b91bfd guests/linux: public key insertion is more robust
contents can have newlines (or not)
2014-02-12 22:11:33 -08:00
Mitchell Hashimoto 12b2572687 kernel/v2: capture error if provider config is bad [GH-2959] 2014-02-11 11:55:04 -08:00
Mitchell Hashimoto dd9dd5127c Merge pull request #2948 from gnawhleinad/master
command/*: clean up usage
2014-02-10 09:02:32 -08:00
Lukasz Jastrzebski 654870a185 Fixing ssh_config proxy_command is not included 2014-02-09 16:27:32 -08:00
Mitchell Hashimoto 8d3afa73d2 providers/virtualbox: config to skip guest additions check 2014-02-08 18:35:09 -08:00
gnawhleinad fbcac2978e clean up usage 2014-02-08 00:20:50 -08:00
Mitchell Hashimoto 8c85e57db1 guests/linux: proper logic on ro 2014-02-07 16:04:36 -08:00
Mitchell Hashimoto fcf2d42717 Merge pull request #2946 from mhahn/fix/master/2945
Fix #2945: Reference correct options variable
2014-02-07 16:03:48 -08:00
Mitchell Hashimoto 8e9ceeaf5c core: Machine has reference to Vagrantfile 2014-02-07 09:16:55 -08:00
Mitchell Hashimoto cdf1d7f318 core: get rid of all uses of config_global 2014-02-06 20:22:15 -08:00
Michael Hahn d68544a906 Ensure options[:mount_options] is defined before checking if it includes key 2014-02-06 14:06:47 -08:00
Michael Hahn 3631b250b7 Fix #2945: Reference correct options variable 2014-02-06 13:59:56 -08:00
Mitchell Hashimoto 848fe5d166 kernel/v2: check for box updates by default
/cc @pearkes @armon
2014-02-05 21:20:33 -08:00
Mitchell Hashimoto 85aa7db17e commands/box: repackage tests 2014-02-05 21:20:29 -08:00
Mitchell Hashimoto 7a6d1a3ff1 commands/box: update command can update a specific box now 2014-02-05 21:20:23 -08:00
Mitchell Hashimoto 386938f0b1 commands/box: update looks prettier on output 2014-02-05 21:20:22 -08:00
Mitchell Hashimoto cf9004241e core: output what we're updating and what we're not 2014-02-05 21:20:21 -08:00
Mitchell Hashimoto 88b64f93a4 commands/box: "update" command 2014-02-05 21:20:19 -08:00
Mitchell Hashimoto 61a1082d65 core: BoxCheckOutdated is *much* simpler, unified logic, tests 2014-02-05 21:20:18 -08:00
Mitchell Hashimoto 1a5ad9f3d5 providers/virtualbox: check for outdated on any start 2014-02-05 21:20:17 -08:00
Mitchell Hashimoto bfca65b098 core: better output for BoxCheckOutdated 2014-02-05 21:20:16 -08:00
Mitchell Hashimoto b5157df2cc core: BoxCheckOutdated only runs if told to 2014-02-05 21:20:14 -08:00
Mitchell Hashimoto d78194654d core: ability to hide success UI 2014-02-05 21:20:12 -08:00
Mitchell Hashimoto e537e02d9d core: BoxCheckOutdated can check if a box is outdated 2014-02-05 21:20:11 -08:00
Mitchell Hashimoto f2509f5c65 commands/box: outdated command to find outdated boxes 2014-02-05 21:20:10 -08:00
Mitchell Hashimoto 4cedd590d9 providers/virtualbox: use new HandleBox middleware 2014-02-05 21:20:05 -08:00
Mitchell Hashimoto d40ff9c390 kernel_v2: test for box_url 2014-02-05 21:20:01 -08:00
Mitchell Hashimoto b2fa785d07 core: Environment loads proper version of box 2014-02-05 21:19:51 -08:00
Mitchell Hashimoto b71cde6b99 core: make box add UI much icer 2014-02-05 21:19:44 -08:00
Mitchell Hashimoto c1d5c8f33c commands/box: remove has --box-version flag 2014-02-05 21:19:43 -08:00
Mitchell Hashimoto 29da748702 commands/box/remove: update for new syntax 2014-02-05 21:19:41 -08:00
Mitchell Hashimoto acc57a3c18 core: clarify output for boxadd error message 2014-02-05 21:19:36 -08:00
Mitchell Hashimoto 28a6beaa56 commands/box: can constrain the version 2014-02-05 21:19:25 -08:00
Mitchell Hashimoto 96e92167d9 commands/box: broken box adding, but more options/tests 2014-02-05 21:19:16 -08:00
Mitchell Hashimoto e8197c4e87 commands/box: list works with the new versions 2014-02-05 21:19:14 -08:00
Mitchell Hashimoto 5030a16f84 kernel/v2: default all configs properly, remove config/default.rb 2014-02-05 15:36:35 -08:00
Mitchell Hashimoto 226dbccef8 guests/linux: don't chown VB shared folders if readonly [GH-2442] 2014-02-04 16:01:14 +01:00
Teemu Matilainen a9337aba22 guests/{free,net}bsd: add `insert_public_key` capability
Copy the cap to missing *bsd variants.
2014-02-04 01:09:29 -03:00
Teemu Matilainen ca56c913aa kernel/v2: fix provisioner config with blocks
Regression from 10d5416.
2014-02-04 00:51:01 -03:00
Teemu Matilainen e5f3f1ffe3 Merge pull request #2892 from tmatilai/openbsd
OpenBSD is not a Linux derivative
2014-02-03 18:27:23 -08:00
Teemu Matilainen 3b5d6c65fd guests/openbsd: Ensure that `PKG_PATH` is set when installing rsync
Depending on the shell, `PKG_PATH` is not necessarily set when Vagrant
runs `pkg_add`.

Ref: GH-2917
2014-02-03 23:17:54 -03:00
Mitchell Hashimoto feeaa69615 kernel/v2: finalize the provisioner configs 2014-02-03 22:28:41 +01:00
Mitchell Hashimoto 59d257f832 provisioners/puppet: mergeable config 2014-02-03 22:27:23 +01:00
Mitchell Hashimoto d864187b1a provisioners/docker: configuration is mergeable 2014-02-03 22:23:26 +01:00
Mitchell Hashimoto 2cc56119b7 kernel/v2: support the preserve_order option (documented) 2014-02-03 22:03:20 +01:00
Mitchell Hashimoto 3aaa57cac9 kernel/v2: support merging properly 2014-02-03 21:30:01 +01:00
Mitchell Hashimoto 10d5416a90 kernel/v2: support overriding provisioner settings 2014-02-03 16:56:39 +01:00
Mitchell Hashimoto 38c2a48ff4 provisioners/docker: always pull images [GH-2901] 2014-02-03 16:26:38 +01:00
Mitchell Hashimoto 1d69e95c1c provisioners/docker: config to disablize -d flag 2014-02-03 16:14:59 +01:00
Teemu Matilainen c11820c848 guests/openbsd: Add back `insert_public_key` cap
Copied from linux guest.
2014-02-03 08:29:54 -03:00
Teemu Matilainen 767f147469 guests/openbsd: OpenBSD is not a Linux derivative 2014-02-03 08:27:57 -03:00
Mitchell Hashimoto b89a47c955 hosts/opensuse: start NFS server properly [GH-2923] 2014-02-03 12:18:09 +01:00
Mitchell Hashimoto f63ef395f1 Merge branch 'rsync_install' of https://github.com/tmatilai/vagrant into tmatilai-rsync_install
Conflicts:
	plugins/guests/freebsd/plugin.rb
	plugins/guests/netbsd/plugin.rb
	plugins/guests/openbsd/plugin.rb
2014-02-03 12:12:49 +01:00
Mitchell Hashimoto 3c10bf7721 communicators/ssh: better error message 2014-02-03 12:09:13 +01:00
Mitchell Hashimoto c1e18325ca Merge pull request #2907 from justincampbell/scp-error-path
provisioners/file: Fix wording of upload permission error
2014-02-03 03:07:36 -08:00
Mitchell Hashimoto 56e85bc989 Merge pull request #2906 from frosario/cable_connected
providers/virtualbox: connect cable for bridged networking
2014-02-03 03:05:16 -08:00
Mitchell Hashimoto ac439852ff kernel/v2: allow IPs to end in ".1" [GH-2914] 2014-02-03 12:02:14 +01:00
Mitchell Hashimoto 592c577b2e Merge pull request #2922 from tmatilai/file_provisioner_expand_path
provisioners/file: expand destination path if capable
2014-02-03 02:52:57 -08:00
Gilles Cornu 466cf58476 ansible generated inventory: skip group variables
Except ':children' for groups of groups, it is safer to avoid generating
':suffix' blocks. At the moment Ansible only supports (but doesn't
recommend) group variables (:vars), and the Vagrant Ansible provisioner
won't support this way to define variables.
2014-02-02 23:28:04 +01:00
Gilles Cornu f564bf7410 Ansible Groups: Accept single item as String
Syntax errors in `ansible.groups` definition are not well handled:
Error returned: undefined method `each' for "machine1":String (NoMethodError)

Being tolerant here doesn't hurt and may avoid people get
confused/annoyed.
2014-02-02 23:21:06 +01:00
Gilles Cornu 84308964e2 ansible generated inventory: deal with orphan VMs
env.active_machines can potentiall return 'invalid' machines:
- Ignore machines that are not declared in current Vagrantfile
- Warn when machines are missing (it usually occurs when the VM is
  removed without `vagrant destroy` and some orphan metadata remains
  in .vagrant/machines/...)
2014-02-02 23:06:27 +01:00
Teemu Matilainen 023d3115dd guests/{free,net,open}bsd: Add `shell_expand_guest_path` capability 2014-02-02 17:38:24 -03:00
Teemu Matilainen e634cdc824 guests: rename LinuxShellExpandFailed error to ShellExpandFailed
Make the error generic for all guests (`DarwinShellExpandFailed` didn't
even exist) and not tied to synced folder.
2014-02-02 17:26:54 -03:00
Mark Aaron Shirley 3bf5032d4b Update Ansible provisioner to only create a single inventory file
The Ansible provisioner will now only create a single inventory file named,
"vagrant_ansible_inventory". All defined Vagrant machines will be added to
this inventory file. Provisioning will now include a "--limit=#{machine}"
option to scope Ansible provisioning tasks to just the current machine. Setting
the Ansible provisioner's "limit" config option will override the new default
limit. Ansible provisioning scripts will now have access to all other defined
machines and what groups they reside in.
2014-02-01 13:04:20 -08:00
Fabio Rehm dd9d20af88 Make sure synced folder types are always symbols
This will make sure that plugins that define synced folders after this
config object has been finalized won't have trouble because of
forgetting to use symbols instead of strings.

References https://github.com/fgrehm/vagrant-cachier/issues/76
2014-02-01 16:01:05 -02:00
Teemu Matilainen b52958bfb6 provisioners/file: expand destination path if capable 2014-02-01 01:23:09 -03:00
Teemu Matilainen ee2ae94c25 synced_folders/rsync: Install `rsync` on guest if needed
Add new `rsync_installed` and `rsync_install` guest capabilities
to detect and install `rsync`.

Also copy `rsync_pre` capability to all Unix guests.
2014-01-31 02:12:57 -03:00
Justin Campbell a633b7343a Fix wording of upload permission error
SCPPermissionDenied expects a path, and this is most likely the
destination (to) and not source (from).

[#2804]
2014-01-28 13:49:14 -05:00
Freddie Rosario ccf14bb398 Applying bugfix for cableconnected issue to earlier releases of virtualbox 4.x series 2014-01-28 11:05:44 -05:00
Freddie Rosario cd0c7dfbd9 Bugfix for github issue 2890.
Changing default behavior of vagrant up to enable "cableconnected" on bridged network devices
2014-01-28 10:54:39 -05:00
Mitchell Hashimoto 09955be2cd provisioners/docker: configure auto start properly for new Docker
[GH-2874]
2014-01-21 20:52:27 -08:00
Mitchell Hashimoto 7e9ea7c1c6 hosts/redhat: recognize Korora [GH-2869] 2014-01-21 09:50:20 -08:00
Mitchell Hashimoto 714c690d8b Merge pull request #2857 from mitchellh/f-ui-revamp
UI revamp
2014-01-20 16:22:36 -08:00
Mitchell Hashimoto 64649f8f1d guests/coreos: restart etcd after configuring networks [GH-2852] 2014-01-18 11:05:29 -08:00
Mitchell Hashimoto fbd8cfc628 hosts/gentoo: more robust check for systemctl path on Gentoo 2014-01-18 11:03:46 -08:00
Tim Gus f0ec355a33 hosts/gentoo: fix nonstandard path to systemctl command 2014-01-18 00:13:54 -05:00
Mitchell Hashimoto ea77194384 providers/virtualbox: more detailed output 2014-01-17 21:03:01 -08:00
Mitchell Hashimoto 5b449c8000 providers/virtualbox: many `detail` level output 2014-01-17 21:03:00 -08:00
Mitchell Hashimoto 8a12bf8694 Merge pull request #2851 from BlackIkeEagle/reload-nfs-exports
guests/linux: use exportfs -a flag to avoid stale exports
2014-01-17 09:57:13 -08:00
Mitchell Hashimoto dd33a26422 providers/virtualbox: network config uses proper format, tests [GH-2854] 2014-01-17 09:53:02 -08:00
BlackEagle b30eacf94f nfs_apply :: exportfs sometimes leaves exports behind
On my machine i had a case where /etc/exports was updated but the old
exports were still there. This was leading to
"exportfs: duplicated export entries" and eventually leading to nfs
being not available for the box.

changing the command exportfs -r to exportfs -ar seems to address this
issue.

Signed-off-by: BlackEagle <ike.devolder@gmail.com>
2014-01-17 10:54:17 +01:00
Mitchell Hashimoto 72702b4884 guests/tinycore: TinyCore Linux support 2014-01-16 17:18:54 -08:00
Mitchell Hashimoto 53347abbca Merge pull request #2819 from stoned/guest-netbsd
Add NetBSD guest support
2014-01-16 10:37:54 -08:00
Mitchell Hashimoto a19e442cf2 provisoiners/docker: only add user to group if not in it [GH-2838] 2014-01-16 10:34:08 -08:00
Mitchell Hashimoto eecba611a4 providers/virtualbox: validate missing keys [GH-2831] 2014-01-16 09:43:31 -08:00
Mitchell Hashimoto c3d0903f85 synced_folders/rsync: output directory under watch for rsync-auto 2014-01-16 09:11:41 -08:00
Mitchell Hashimoto 8a1995bec9 synced_folders/rsync: make sure host path ends in "/" 2014-01-15 21:22:37 -08:00
Mitchell Hashimoto 73b72deb0a synced_folders/rsync: convert path to cygpath on Windows 2014-01-15 21:13:08 -08:00
Mitchell Hashimoto 285bda7a68 synced_folders/nfs: don't nfs_prune on hosts that don't support it 2014-01-15 20:28:27 -08:00
Mitchell Hashimoto 1d2da09953 Merge pull request #2824 from masteinhauser/patch-1
guests/solaris: More specific Solaris <11 detection.
2014-01-15 20:11:18 -08:00
Mitchell Hashimoto eae2edf063 providers/virtualbox: retry list hostonlyifs [GH-2831] 2014-01-15 19:55:31 -08:00
Teemu Matilainen e979b84d36 synced_folders/nfs: Register `nfs_client_install` caps to correct distros 2014-01-15 23:37:02 -03:00
Mitchell Hashimoto ead1382343 provisioners/docker: fix wrong variable usage
caught by @pda
2014-01-15 17:33:55 -08:00
Mitchell Hashimoto 4fab57576b synced_folders/rsync: run hostpath through fs_real_path
This fixes issues with drive letter casing on Windows
2014-01-15 11:30:32 -08:00
Gustavo Gama 262e2c0192 Fix typo 2014-01-15 09:40:41 -02:00
Mitchell Hashimoto 2ca498a5dd provisioners/docker: build images using new DSL 2014-01-14 09:22:55 -08:00
Mitchell Hashimoto b3de12702a Merge branch 'add_building_local_dockerfiles' of https://github.com/jpfuentes2/vagrant into jpfuentes2-add_building_local_dockerfiles 2014-01-14 08:17:44 -08:00
Myles Steinhauser b34fdf010b More specific Solaris 11 detection 2014-01-14 09:56:01 -05:00
Myles A. K. Steinhauser e5445442c1 More specific Solaris <11 detection.
Note: This will probably break on Solaris 12+, but not certain of a better approach for now.
2014-01-14 09:52:27 -05:00
Mitchell Hashimoto 526231812f website/docs: better docs 2014-01-13 22:29:10 -08:00
Stoned Elipot 10169f8e99 Add NetBSD guest support 2014-01-14 07:25:35 +01:00
Mitchell Hashimoto 04f1854840 synced_folders/rsync: unit tests for the callback, fix bug 2014-01-13 22:01:09 -08:00
Mitchell Hashimoto fe2844ca59 synced_folders/rsync: rsync-auto command 2014-01-13 21:43:31 -08:00
Mitchell Hashimoto c05a44face synced_folders/rsync: pass --delete option to delete bad files 2014-01-13 11:40:46 -08:00
Mitchell Hashimoto b4b62daf5c synced_folders/rsync: expand host paths relative to root path 2014-01-13 11:34:49 -08:00
Mitchell Hashimoto 309d12a16b synced_folders/rsync: `vagrant rsync` syncs the folders 2014-01-13 11:25:29 -08:00
Mitchell Hashimoto 59218ded68 synced_folders/rsync: move rsync logic out to helper 2014-01-13 11:01:50 -08:00
Mitchell Hashimoto 9b383740ba hosts/bsd: use Util::Which instead of system("which") 2014-01-12 22:37:39 -08:00
Mitchell Hashimoto b8601423c7 hosts/bsd: don't execute shell for sudo commands [GH-2808] 2014-01-12 22:34:45 -08:00
Mitchell Hashimoto 8bc36824bf commands/list-commands: lists all commands primary and non-primary 2014-01-11 09:32:13 -08:00
Mitchell Hashimoto 6a7e07c53f provisioners/chef: don't follow symlink when chown 2014-01-11 08:02:59 -08:00
Mitchell Hashimoto 7b2a0716f1 synced_folders/rsync: warn if password auth 2014-01-10 20:37:11 -08:00
Mitchell Hashimoto 55b0dffd36 synced_folders/rsync: output what is being excluded 2014-01-10 18:06:16 -08:00
Mitchell Hashimoto 60f3d224c9 synced_folders/rsync: can exclude files 2014-01-10 18:01:38 -08:00
Mitchell Hashimoto 2e3fcf576c synced_folders/rsync: allow guests to execute things before 2014-01-10 17:51:44 -08:00
Mitchell Hashimoto 38fbbb6c56 synced_folders/rsync: Initial commit working 2014-01-10 17:40:29 -08:00
Mitchell Hashimoto fcae8dd687 Merge pull request #2766 from graingert/patch-1
provisioners/salt: Allow defining of <install-type> and <install-type-args>
2014-01-10 15:43:25 -08:00
Mitchell Hashimoto 9a58caaf9c synced_folders/nfs: always prune [GH-2738] 2014-01-10 15:41:57 -08:00
Mike Fiedler 9679eccb06 extend Virtualbox convenince methods
In the vein of #2426, I too can never remember syntax, and end up
hunting for either an exisiting Vagrantfile or starting to dig up
details.
2014-01-10 12:41:23 -05:00
Mitchell Hashimoto 91380c0650 synced_folders/nfs: automatically install NFS client if possible
If guests have the following capabilities, automatic NFS client
installation will be done:

  * nfs_client_installed - Checks if the NFS client is installed
  * nfs_client_install - Install the NFS client

Support is already in for Debian, Ubuntu, RedHat, CentOS, and Fedora
2014-01-09 16:58:20 -08:00
Mitchell Hashimoto 5e835f4201 Merge pull request #2792 from smoyer/redhat_hostname_patch
guests/redhat: use FQDN for hostname
2014-01-08 20:58:59 -08:00
Mitchell Hashimoto 732a03c1c4 guests/linux: properly quote and insert public key 2014-01-08 15:12:26 -08:00
smoyer 3964298504 This was introduced in 1.4.1 with d26c147.
This PR sets the active hostname back to the name specified in the Vagrantfile (fqdn) and updates the unit tests.

Setting it to the short name causes loads of problems while configuring the system. I've had issues with sudoers hostname matching, Weblogic certificate generation and a few others. Even if I changed all of the Chef recipes, the fqdn is set in /etc/sysconfig/network so the active hostname will switch to the fqdn after a reboot.
2014-01-08 17:49:54 -05:00
Mitchell Hashimoto 9a419c3f63 Merge pull request #2784 from mitchellh/f-host-capabilities
Host Capabilities
2014-01-08 08:54:26 -08:00
Teemu Matilainen 64ea647e09 provisioners/chef-solo: Fix copy&paste "Puppet" from a deprecation message 2014-01-08 13:27:35 -03:00
Mitchell Hashimoto e2af545182 kernel/v2: a host always exists, remove dumb check 2014-01-07 21:20:28 -08:00
Mitchell Hashimoto e9f6c81ab7 hosts/*: proper detect API 2014-01-07 21:18:36 -08:00
Mitchell Hashimoto 26b564566b hosts/null: needs to accept env as param 2014-01-07 21:14:33 -08:00
Mitchell Hashimoto a72e7473d5 hosts/windows: convert 2014-01-07 21:13:21 -08:00
Mitchell Hashimoto 4d47dae5b9 many more hosts converted 2014-01-07 21:11:59 -08:00
Mitchell Hashimoto 4cec8b48d9 hosts/freebsd: convert 2014-01-07 21:01:03 -08:00
Mitchell Hashimoto a6c7cc481e convert more hosts: arch and linux 2014-01-07 20:53:39 -08:00
Mitchell Hashimoto bdb88da743 hosts/bsd: convert to new style 2014-01-07 20:39:24 -08:00
Mitchell Hashimoto 5e490e3746 Get tests to pass 2014-01-07 19:26:03 -08:00
Mitchell Hashimoto 93e365bb33 core: Vagrant::Environment uses new host settings 2014-01-07 19:11:08 -08:00
Mitchell Hashimoto ea502c5c3d commands/plugin: vagrant plugin install can accept multiple 2014-01-07 14:17:48 -08:00
Mitchell Hashimoto 24a2892236 Update CHANGELOG and website 2014-01-07 14:11:33 -08:00
Ryan S. Brown b53ae446d2 Allow `vagrant (un)install plugin1 plugin2 plugin3` 2014-01-07 14:09:31 -08:00
Mitchell Hashimoto 86cab61c27 commands/plugin: support installing from file 2014-01-06 09:27:37 -08:00
Thomas Grainger feb748f488 Allow defining of <install-type> and <install-type-args> 2014-01-06 12:22:43 +00:00
Mitchell Hashimoto f612ec7549 core: support plugin sources, and mask Bundler errors 2014-01-05 23:13:49 -08:00
Mitchell Hashimoto 0117521744 commands/plugin: vagrant update is fancier now (see website docs) 2014-01-05 22:33:05 -08:00
Mitchell Hashimoto 561e65ec72 commands/plugin: list shows version constraints and entrypoints 2014-01-05 21:16:41 -08:00
Mitchell Hashimoto bef7051943 commands/plugin: InstallGem tests 2014-01-05 21:08:55 -08:00
Mitchell Hashimoto aeb0d1a480 commands/plugin: fix plugin existence middleware, add tests 2014-01-05 20:57:55 -08:00
Mitchell Hashimoto 5fe2994005 commands/plugin: convert all actions to use the new classes 2014-01-05 20:50:25 -08:00
Mitchell Hashimoto 8904319beb commands/plugin: install version and entrypoints work 2014-01-05 20:47:02 -08:00
Mitchell Hashimoto 9dc1307b7c commands/plugin: remove --plugin-prerelease 2014-01-05 17:46:20 -08:00
Mitchell Hashimoto d368b3cf62 core: Tolerate syntax errors in ~/.gemrc [GH-2760] 2014-01-05 17:11:24 -08:00
Mitchell Hashimoto 8823f43f3a commands/plugin: error if uninstall non-existent plugin 2014-01-05 16:03:00 -08:00
Mitchell Hashimoto e1c9431085 commands/plugin: uninstall works again 2014-01-05 16:02:00 -08:00
Mitchell Hashimoto 95aeb9443d commands/plugin: Remove PruneGems 2014-01-05 14:55:44 -08:00
Mitchell Hashimoto 86610bf735 installing gems works 2014-01-05 14:54:50 -08:00
Mitchell Hashimoto 1eef75a715 commands/plugin: list uses PluginManager 2014-01-05 08:42:34 -08:00
Mitchell Hashimoto 279b171339 commands/plugin: remove unnecessary line 2014-01-04 17:22:07 -08:00
Mitchell Hashimoto ae17dc09eb commands/plugin: list plugins uses Bundler 2014-01-04 17:21:53 -08:00
Mitchell Hashimoto 8450f20e87 Move StateFile into Vagrant::Plugin core 2014-01-04 16:45:41 -08:00
Mitchell Hashimoto 5387984e0f commands/plugin: allow within Bundler env (cause we always are) 2014-01-04 16:32:46 -08:00
Mitchell Hashimoto 4c6957b5cf communicators/ssh: if insert_key is false, don't insert a key 2014-01-03 11:29:44 -08:00
Mitchell Hashimoto 54e640b0c9 communicators/ssh: output UI when inserting key 2014-01-03 11:22:05 -08:00
Mitchell Hashimoto b3a9e6a088 insert_public_key cap, and use that if it exists 2014-01-03 11:13:21 -08:00
Mitchell Hashimoto 38e7166a21 communicators/ssh: support passwords 2014-01-03 09:55:34 -08:00
Mitchell Hashimoto e115322e78 core: accept passwords in ssh_info 2014-01-03 09:48:35 -08:00
Mitchell Hashimoto 2f7163386d providers/virtualbox: don't error when intnet set to "true" [GH-2751] 2014-01-03 08:31:14 -08:00
Mitchell Hashimoto e29bcba955 provisioners/puppet: alphabetize 2014-01-02 14:44:49 -08:00
Mitchell Hashimoto 040e1a2e0a provisioners/chef: synced_folder_type 2014-01-02 14:40:57 -08:00
Mitchell Hashimoto 1da271c536 provisioners/puppet: synced_folder_type [GH-2709] 2014-01-02 14:37:47 -08:00
Mitchell Hashimoto 862331fbf0 Merge branch '1.4.3'
Conflicts:
	CHANGELOG.md
	lib/vagrant/version.rb
2014-01-02 10:16:52 -08:00
Mitchell Hashimoto 3f2d3886b2 providers/virtualbox: fix package [GH-2739] 2014-01-02 10:09:05 -08:00
Ryan S. Brown 23ce05d166 detect fedora 19 and 20 2014-01-02 11:09:11 -06:00
Mitchell Hashimoto 437b186966 Merge pull request #2734 from seginoviax/funtoo
New guest: Funtoo
2014-01-01 20:48:46 -08:00
Seginoviax 12176515da Add funtoo guest support. Based heavily on https://github.com/mitchellh/vagrant/pull/1840 2013-12-31 17:33:10 -08:00
Seginoviax a4c74ea87a Revert "Add funtoo guest support. Based heavily on https://github.com/mitchellh/vagrant/pull/1840"
This reverts commit 3559c08086.
2013-12-31 17:12:19 -08:00
Mitchell Hashimoto 7141be065a Merge pull request #2674 from phinze/static-nfs-guest-ips
core: problems with using VirtualBox guest properties for reading NFS Guest IP
2013-12-31 11:00:23 -08:00
Mitchell Hashimoto 7f5c85cf20 provisioners/chef-solo: delete data bag secret [GH-2712] 2013-12-31 10:44:08 -08:00
Mitchell Hashimoto 54f4cffc00 providers/virtualbox: export after checking if package exists [GH-2380] 2013-12-31 08:45:56 -08:00
Seginoviax 3559c08086 Add funtoo guest support. Based heavily on https://github.com/mitchellh/vagrant/pull/1840 2013-12-31 00:54:32 -08:00
Mitchell Hashimoto f89c4412b2 synced_folders/nfs: lock around sudo input [GH-2680] 2013-12-30 14:45:40 -08:00
Mitchell Hashimoto 28720b181d guests/ubuntu: remove mount_nfs cap 2013-12-30 08:12:10 -08:00
Paul Hinze fc66ec1660 providers/virtualbox: allow and prefer static guest IPs for NFS
Since vbox guest properties are proving to be less reliable than we had
hoped, bring back the static config parsing mechanism for finding a
guest IP to hand to NFS. If we find a static IP (or set of IPs) we'll
use that instead of trying to probe guest properties.

This retains NFS support for DHCP interfaces while regaining the
reliability that we previously had when static IPs were required.
2013-12-28 17:01:08 -06:00
Mitchell Hashimoto 5d39cc381f Merge pull request #2694 from tmatilai/plugin-json-errors
core: show more informative error if plugin.json parsing fails
2013-12-28 13:12:59 -08:00
Mitchell Hashimoto 0316665ad8 commands/plugin: use default version requirement 2013-12-28 14:10:57 -07:00
Mitchell Hashimoto 35d4737553 Merge pull request #2705 from tmatilai/upstart-emit-nfs
Emit upstart event `vagrant-mounted` also on NFS mounts
2013-12-28 12:50:53 -08:00
Mitchell Hashimoto 2cf864e95b hosts/bsd: check exports only if exports file exists [GH-2714] 2013-12-28 13:48:13 -07:00
Marc Meszaros 13ff159d8c Fix salt provisioner error namespace to be more consistent with other provisioners 2013-12-27 22:38:44 -05:00
Marc Meszaros 194d7d11cd Add error messages to localization file for salt provisioner 2013-12-27 22:37:54 -05:00
Tobias Bähr 364488eba8 Set default value to avoid a prompt 2013-12-22 18:48:14 +01:00
Teemu Matilainen 572cdeeda9 guests/linux: Emit upstart event on VirtualBox using the expanded path 2013-12-22 08:55:59 -03:00
Teemu Matilainen 2fab268ede guests/linux: Emit upstart event `vagrant-mounted` also on NFS mounts
Complements #2502, and fixes error on VMs without upstart (like #2596).
2013-12-22 08:46:24 -03:00
Teemu Matilainen a5b84f413e core: More informative error if plugin.json parsing fails 2013-12-20 07:10:10 -03:00
Mitchell Hashimoto 489506ff83 guests/linux: up the amount of retries for NFS mounts 2013-12-18 08:38:31 -08:00
Mitchell Hashimoto 9ac4ec85dd Merge pull request #2677 from purpleidea/fix_puppet_apply
provisioner/puppet: do not prepend default path because it can override modules.
2013-12-18 08:31:21 -08:00
James Shubin d4c76d1bcf Do not prepend default path because it can override modules.
It is common for Puppet to manage itself. If the puppet code you are
deploying pushes files to /etc/puppet/modules/, then prepending this
path can break deployment because it will override the module path if
the deployment code is changing. There is no good reason to include this
path. Puppet has built in defaults for this reason.
2013-12-17 14:29:54 -05:00
Charles Blaxland 7518bf94eb Force rm of chef config files #2669 2013-12-17 17:53:52 +11:00
Mitchell Hashimoto 042a8d6428 Merge pull request #2667 from gildegoma/bugfix_ansible_raw_args
provisioner/ansible: Fix a bug in `raw_arguments` option
2013-12-16 13:15:30 -08:00
Gilles Cornu e5f45e2b79 Ansible: Fix a bug in `raw_arguments` option
Without this change, it is not possible to pass more than one "raw"
argument, which was not the expected behavior. In addition to Array
format, String (for a single argument) is still accepted (for sake of
"backward compatibility" and ease of use).

Note: Due to low/expert usage of this option, I think that it is not
necessary to add more robust validation on this parameter (e.g. Array
of String type checking or argument syntax pattern matching). Use it at
your own risk ;-)
2013-12-16 21:20:10 +01:00
Charlie Huggard d26c1471d7 Refactor ChangeHostName for EL.
Based off of the Debian pattern. Need to add tests.

Related to #2653 and #2592
2013-12-16 01:52:39 -06:00
Mitchell Hashimoto da91572ce7 commands/init: error if can't write Vagrantfile [GH-2660] 2013-12-15 11:28:51 -08:00
Gilles Cornu 213534d185 Merge pull request #2606 from maspwr/ansible-groups
Add ability to use Ansible groups in generated inventory. Fixes #2551.
2013-12-14 07:03:22 -08:00
Mitchell Hashimoto 2c568a75f2 commands/ssh: use proper variable 2013-12-13 22:32:01 -08:00
Mitchell Hashimoto 2bebf188d6 hosts/bsd: check for exports file issues prior to exporting NFS 2013-12-13 22:14:13 -08:00
Mitchell Hashimoto c1141dded3 providers/virtualbox: don't clear /etc/exports on BSDs for NFS [GH-2645] 2013-12-13 22:03:14 -08:00
Mitchell Hashimoto 902b769e6b core: -t/-T work for vagrant ssh -c [GH-2618] 2013-12-13 21:07:54 -08:00
Fabio Rehm 46ba43e6ac provisioners/docker: Display warning in case a version get specified on the Vagrantfile and the guest is a RedHat-ian guest [GH-2649] 2013-12-13 23:06:20 -02:00
Fabio Rehm 6f304d5e29 provisioners/docker: Move DockerConfigureVagrantUser capability up to Linux guests [GH-2649] 2013-12-13 23:06:20 -02:00
Fabio Rehm 5a842fc609 provisioners/docker: Check if epel-release is installed on RedHat-ian guests before attempting installation [GH-2649] 2013-12-13 23:06:20 -02:00
Naoto TAKAHASHI 746d406558 add docker for redhat 2013-12-14 02:35:34 +09:00
Teemu Matilainen d321b9199e provisioners/chef: fix node/client deletion when node_name is not set [GH-2345]
V2 config uses `hostname` instead of `host_name`.
2013-12-13 00:51:22 -03:00
Arthur Neves c57073da7b Rename docker_client and docker_installer
We can rename those classes and remove the docker_ prefix as they
already have a module namespace.
2013-12-12 14:59:03 -05:00
Markus Kern c8a09b344b guests/redhat: Don't error if ifdown fails [GH-2614] 2013-12-10 20:04:36 +00:00
Mitchell Hashimoto 05b2e03586 guests/redhat: don't ifdown non-existent interfaces [GH-2614] 2013-12-10 09:04:20 -08:00
Mitchell Hashimoto ed4cfa913c Merge pull request #2620 from ShonM/master
guests/freebsd: Update FreeBSD configure_networks with less shell specifics
2013-12-10 08:53:34 -08:00
Paul Hinze abe0731d2e guests/{ubuntu,debian}: fix change_host_name for trailing dots [GH-2610]
When `/etc/hosts` contained a FQDN with a trailing dot, the `\b` in the
sed expression would not match, since dot is not considered to be a word
character.

Fix this by regexp-escaping the hostname search, and matching the end of
the line on optional space followed by additional characters.

Also add some tests that extract the regexp used by sed and verify that
it does what we want. These will hopefully serve us in the future if we
ever need to test additional edge cases.
2013-12-09 18:56:45 -06:00
Shon M 3e1471fb53 Update FreeBSD configure_networks with less shell specifics 2013-12-09 17:27:54 -07:00
Jacques Fuentes 579cc8e558 Remove defunct @build_options reference 2013-12-09 18:36:57 -05:00
Jacques Fuentes 1738f9dccf Add option to Docker provisioner to build local images 2013-12-09 17:54:32 -05:00
Mark Aaron Shirley 906579d25a Add ability to use Ansible groups in generated inventory. Fixes #2551. 2013-12-08 23:08:03 -08:00
Matt Alexander edeb5f0e9f Add the symlink back that disabled renaming of network interface names 2013-12-07 14:59:40 -06:00
Matt Alexander df67d2b44f Run "ip link set [eth1] down" before running "netctl start [eth1]" in Arch guest network configuration 2013-12-07 14:22:19 -06:00
Mitchell Hashimoto d80f32c20f synced_folders/nfs: allow plugins to provide valid NFS ids 2013-12-06 16:42:34 -08:00
Mitchell Hashimoto 2c65d247da core: Allow options to be passed down into SF cleanup 2013-12-06 16:40:24 -08:00
Mitchell Hashimoto 76df3ced03 synced_folders/nfs: style 2013-12-06 15:07:55 -08:00
Mitchell Hashimoto 55931d507e Merge branch 'nfs-sync-folder-cleanup' of https://github.com/emyl/vagrant into emyl-nfs-sync-folder-cleanup
Conflicts:
	plugins/providers/virtualbox/action.rb
2013-12-06 15:06:34 -08:00
Mitchell Hashimoto f3d71de022 Merge pull request #2591 from instilled/arch-netctl-fix
guests/arch: netctl fix
2013-12-06 15:02:41 -08:00
Mitchell Hashimoto 89f4e14ab3 Merge pull request #2585 from mitchellh/2585-fix-docker-image-assignment
provisioner/docker: unable to run multiple docker containers based off the same image
2013-12-06 14:56:15 -08:00
Teemu Matilainen b0919b916b Remove extraneous character
Going down? ;)
2013-12-06 18:57:27 -03:00
Mitchell Hashimoto 5b7a4d7f6e Merge pull request #2596 from tmatilai/fix-initctl-test
guests/linux: fix testing if initctl exists
2013-12-06 13:22:03 -08:00
Mitchell Hashimoto b65462faf1 providers/virtualbox: resume should wait for boot 2013-12-06 13:21:07 -08:00
Teemu Matilainen c566465bdc Fix testing if initctl exists
If /sbin/initctl was not found, the command (`false && ...`) returned
non-zero exit code leading to Vagrant throwing an exception.
2013-12-06 18:17:41 -03:00
Mitchell Hashimoto 17b68f7d50 provisioners/puppet: use unique directory for each definition 2013-12-06 12:39:50 -08:00
Mitchell Hashimoto f8223d4704 provisioners/chef: support proper counter for multiple chefs 2013-12-06 12:26:48 -08:00
Mitchell Hashimoto 38f931ba93 provisioners/shell: array args properly work 2013-12-06 11:28:32 -08:00
Fabio Rehm 8688c6b8b2 provisioners/docker: Only assign the `image` config in case it was not specified 2013-12-05 22:12:44 -02:00
Mitchell Hashimoto 0d02ada43b providers/virtualbox: only clear shared folders if we have a VM 2013-12-05 13:39:23 -08:00
John Bellone bebaa63063 [provisioner/chef]: Update base to fix typo.
It seems this was introduced by accident with #2281.
2013-12-05 15:24:53 -05:00
me 2a75c34d62 systemctl wasn't a good idea 2013-12-05 16:01:44 +01:00
me 158d82ea39 Avoid udev rule masking and configure ifaces with sed instead. 2013-12-05 15:16:59 +01:00
Teemu Matilainen 897fde3274 Add missing argument to ProviderVirtualBox::SyncedFolder#driver call
GH-2577 missed passing the `machine` to the `driver` method.
2013-12-05 00:21:16 -03:00
Fabio Rehm 7e0b0a5a3c provisioners/docker: Extract container lookup method 2013-12-04 22:13:17 -02:00
Fabio Rehm c7a5592b96 provisioners/docker: Ensure checks for whether the container exists / is running works accross multiple Docker versions [GH-2579] 2013-12-04 22:10:39 -02:00
Teemu Matilainen 294f4def91 Fix `vagrant plugin` commands
`StateFile#installed_plugins` returns now a Hash instead of Array.

Fixes regression from 39b2539.
2013-12-04 18:25:33 -03:00
Mitchell Hashimoto 3df245f1fd provisioners/chef: create/chown backup folders [GH-2281] 2013-12-04 11:51:05 -08:00
Mitchell Hashimoto d354cdda4a core: request users upgrade plugins if they're old 2013-12-04 11:43:39 -08:00
Mitchell Hashimoto 236141ba90 commands/plugin: old state files default to 0 for vagrant version 2013-12-04 11:29:17 -08:00
Mitchell Hashimoto 39b2539ec7 commands/plugin: state file keeps track of the Vagrant version 2013-12-04 11:17:48 -08:00
Emiliano Ticci 07bbca426e NFS/VBox: remove dedicated cleanup action in favour of native routine. 2013-12-04 12:29:09 +01:00
Emiliano Ticci c95fc4e27c VirtualBox shared folders: remove dedicated cleanup action in favour of native routine. 2013-12-04 12:22:01 +01:00
Mitchell Hashimoto 4f17a70c4e commands/plugin: ignore default gems when pruning
For modern RubyGems compatibility
2013-12-03 23:48:06 -08:00
Mitchell Hashimoto e83070371d kernel/v2: fix validation on checksum types 2013-12-03 18:46:22 -08:00
Mitchell Hashimoto 832a5ef70b providers/virtualbox: clean up synced folders on destroy 2013-12-03 18:44:37 -08:00
Mitchell Hashimoto ca521887eb Merge pull request #2561 from emyl/synced-folder-cleanup-v2
core: Enhance the synced folder plugin implementation with a cleanup routine
2013-12-03 18:08:42 -08:00
Mitchell Hashimoto 146bc34019 Merge pull request #2549 from mitchellh/f-docker-provisioner
docker provisioner
2013-12-03 17:47:42 -08:00
Mitchell Hashimoto 8f4fa897d0 provisioners/docker: use proper UNSET_VALUE for no value 2013-12-03 16:19:08 -08:00
Mitchell Hashimoto 999ce22354 provisioners/docker: output version when installing 2013-12-03 14:39:32 -08:00
Mitchell Hashimoto f7916c0cff provisioners/docker: output for each image pulling 2013-12-03 14:38:38 -08:00
Mitchell Hashimoto ecbd0bfa85 provisioners/docker: style nitpicks 2013-12-03 14:36:14 -08:00
Mitchell Hashimoto 8d6cac959f provisioners/docker: only allow 'args' special 2013-12-03 14:35:56 -08:00
Mitchell Hashimoto 33d3c28086 provisioners/docker: simplify run, output which are running 2013-12-03 14:33:13 -08:00
Mitchell Hashimoto c55f7dfd64 provisioners/docker: allow images to be configured with images: 2013-12-03 14:25:20 -08:00
Mitchell Hashimoto d3b7bffc65 provisioners/docker: style nitpick on unless 2013-12-03 14:19:31 -08:00
Mitchell Hashimoto dda7cbb412 provisioners/docker: make sure version is correct type, fix Ruby warning 2013-12-03 14:18:30 -08:00
Mitchell Hashimoto 5ee3a06740 provisioners/chef: fix validate return so that it is properly formatted 2013-12-03 13:59:59 -08:00
Mitchell Hashimoto d9dc2d6cfd guests/linux: --no-wait on emit [GH-2564] 2013-12-03 12:14:10 -08:00
Mitchell Hashimoto 9cd9e6e55d communicators/ssh: add -E to sudo to preserve env 2013-12-03 12:07:14 -08:00
Mitchell Hashimoto d2bc1dbc3b Merge pull request #2560 from phinze/vbox-nfs-dhcp-support
providers/virtualbox: support DHCP interfaces for NFS
2013-12-03 11:49:54 -08:00
Paul Hinze c25172d0f7 providers/virtualbox: support DHCP interfaces for NFS
Previously, we required a host-only interface with a static IP for NFS
to work in VirtualBox, because we needed access to the guest's IP in
order to properly configure mount commands.

After boot, VirtualBox exposes the IP addresses of a guest's network
adapters via the "guestproperty" interface.

This adds support for reading VirtualBox guest properties to the
VirtualBox driver and utilizes that support to prepare NFS settings,
which removes the necessity for a static IP for NFS to work.

In this commit we also start building out scaffolding for unit testing
vbox actions and drivers.

Test plan:
 - Prepare a Vagrantfile with the following:
   * private network with type: :dhcp
   * synced folder with nfs: true
 - Boot a VM from this Vagrantfile using the virtualbox provider
 - Machine should boot successfully with working synced folder
2013-12-03 10:21:28 -05:00
Emiliano Ticci 578393ac8e Add cleanup routine to synced folder plugin implementation 2013-12-02 11:19:09 +01:00
Mitchell Hashimoto 72edddbb09 core: do proper type conversions for box checksum types 2013-12-01 23:03:21 -08:00
Mitchell Hashimoto 555f4c7dcf kernel/v2: support checksum on box config 2013-12-01 23:03:21 -08:00
Mitchell Hashimoto 1094ac976e core: support checksum on box add 2013-12-01 23:03:20 -08:00
Nicolas Delaby 7cd7077467 salt-bootstrap.sh: options are only allowed before install arguments 2013-11-29 15:52:12 +01:00
Fabio Rehm 3289141fc3 provisioners/docker: Clean up some leftovers from vocker 2013-11-29 10:22:06 -02:00
Fabio Rehm 82fc9330af provisioners/docker: Simplify raising of Docker related errors 2013-11-29 10:22:06 -02:00
Fabio Rehm 0536817e90 provisioners: Import Docker provisioner code from Vocker 2013-11-29 10:22:06 -02:00
Mitchell Hashimoto cfb258a55b provisioners/shell: s/unless/if !/ 2013-11-29 00:02:20 -08:00
Paul Hinze fef60242b0 provisioners/shell: fix validation for args [GH-1949]
The logic change in 57d4775140 introduced
a bug where neither strings nor arrays provided as `args` for shell
provisioners would pass validation.

This fixes that problem along with a few extras:

- split out arg validation into a private method
- update comment describing valid args
- add a few unit tests around config validation
2013-11-28 19:54:10 -06:00
Elan Ruusamäe 1df4f5a8ed require pld/cap/change_host_name 2013-11-27 09:38:28 +02:00
Elan Ruusamäe 2416149aa3 fix hostname change on pld 2013-11-27 09:35:18 +02:00
Mitchell Hashimoto db9c8dd6b3 core: validate box_download_ca_cert_file, expand 2013-11-26 21:10:33 -08:00
Mitchell Hashimoto d0f14250d6 core: can specify config.vm.box_download_ca_cert 2013-11-26 19:35:04 -08:00
Mitchell Hashimoto cd3e19306c commands/box/add: custom CA cert [GH-2337] 2013-11-26 19:32:56 -08:00
Mitchell Hashimoto 798432febe provisioners/chef: validate environments path [GH-2381] 2013-11-26 18:57:27 -08:00
Mitchell Hashimoto 6f2d6981cb website/docs: better Chef docs [GH-2436] 2013-11-26 11:44:16 -08:00
Mitchell Hashimoto fc190fad9f guests/redhat: DHCP_HOSTNAME set to hostname [GH-2441] 2013-11-26 11:28:47 -08:00
Mitchell Hashimoto 5790235a54 Merge pull request #2539 from bearstech/debian_ifdown_ifup
guests/debian: ifdown is not enough for network config
2013-11-26 11:16:37 -08:00
Mitchell Hashimoto cd106986b4 provisioners/ansible: use the first private key
/cc @gildegoma - Does Ansible support multiple private keys? Vagrant
now does, so this isn't exactly safe.
2013-11-26 10:07:52 -08:00
Mathieu Lecarme 09a86bd70a Sometimes, ifdown is not enough. 2013-11-26 13:40:50 +01:00
Mitchell Hashimoto 9dfac9557b provisioners/puppet: fix some bonehead mistakes 2013-11-25 22:46:10 -08:00
Mitchell Hashimoto 25a8491465 provisioners/puppet: manifests path can be in the VM [GH-1805] 2013-11-25 22:39:20 -08:00
Mitchell Hashimoto d7b74ca8b9 core: config.vm.box_url can be array of urls [GH-1958] 2013-11-25 21:57:20 -08:00
Mitchell Hashimoto d88e3dcff2 kernel/v2: new style default box url 2013-11-25 18:46:54 -08:00
Mitchell Hashimoto 7d1fe7c6fe kernel/v2: properly set default value for client cert 2013-11-25 16:51:22 -08:00
Mitchell Hashimoto 13b52f6b6e Merge branch 'client-certs' of https://github.com/sthulb/vagrant into sthulb-client-certs
Conflicts:
	config/default.rb
	lib/vagrant/action/builtin/handle_box_url.rb
	plugins/commands/box/command/add.rb
2013-11-25 16:50:11 -08:00
Mitchell Hashimoto 8581a93e76 provisioners/chef: upload encrypted data bag secret to prov path
[GH-1246]
2013-11-25 15:55:00 -08:00
Mitchell Hashimoto 45e09eb677 core: allow multiple private keys [GH-907] 2013-11-25 15:45:39 -08:00
Mitchell Hashimoto d08e3f7ab3 provisioners/puppet: use better flags for one-time run 2013-11-25 15:28:17 -08:00
Mitchell Hashimoto 4a3259443d provisioners/puppet: make the output a bit clearer 2013-11-25 15:18:35 -08:00
Mitchell Hashimoto e72cd9c98e provisioners/puppet: can specify a client key/cert 2013-11-25 15:17:05 -08:00
Mitchell Hashimoto 57c25a26ad provisioners/puppet: update config to new style 2013-11-25 15:07:12 -08:00
Mitchell Hashimoto 57d4775140 provisioners/shell: allow array args [GH-1949] 2013-11-25 13:36:51 -08:00
Mitchell Hashimoto 741930b439 Merge pull request #1949 from mpapis/feature/shell_provisoner_array_args
provisioners/shell: implement array arguments from #1569
2013-11-25 13:31:48 -08:00
Mitchell Hashimoto 48973a72d5 commands/box/list: clean up 2013-11-25 13:26:46 -08:00
Mitchell Hashimoto 3bedc77cc4 Merge branch '2293-track-box-url' of https://github.com/fgrehm/vagrant into fgrehm-2293-track-box-url
Conflicts:
	plugins/commands/box/command/list.rb
2013-11-25 13:20:26 -08:00
Mitchell Hashimoto 195f0d9639 guests/linux: emit upstart event for vagrant mounted if avail [GH-2502] 2013-11-25 11:31:15 -08:00
Mitchell Hashimoto 602505a136 providers/virtualbox: some validation around internal networks 2013-11-25 11:25:10 -08:00
Mitchell Hashimoto 2d957cdaab providers/virtualbox: internal networks [GH-2020] 2013-11-25 11:13:46 -08:00
Mitchell Hashimoto cc57933675 update changelog 2013-11-24 21:29:04 -08:00
Mitchell Hashimoto 10daa6fddf Merge pull request #2366 from gildegoma/ansible-extra-vars
provisioners/ansible: Improvements for 'extra_vars' argument
2013-11-24 21:21:44 -08:00
Mitchell Hashimoto 6baab10df4 communicators/ssh: pty can be enabled 2013-11-24 16:48:07 -08:00
Mitchell Hashimoto 7ba9d2d0a0 commands/init: add --output flag [GH-1364] 2013-11-24 11:53:15 -08:00
Mitchell Hashimoto 5cbc54d570 commands/box: list has machine-readable output 2013-11-24 11:42:24 -08:00
Mitchell Hashimoto 15d639c8dc website: document machine-readable output 2013-11-24 11:37:57 -08:00
Mitchell Hashimoto 42a71a953d commands/status: add machine-readable output 2013-11-24 11:11:38 -08:00
phinze 688bca14f5 refactoring ubuntu/debian change_host_name
there's been a lot of churn around this code, so i figure it was worth
trying to clean it up.

 - the methods were doing a lot, so make them into template methods with
   one helper per step
 - spread out /etc/hosts regexp into a couple of helper variables for
   clarity
 - remove handling for broken hostname implementations (like basing all
   of the checks on name.split('.')[0]), since it seems reasonable to
   remove code dedicated only to handling broken boxes
 - DRY up the shared code between debian/ubuntu implementations, which
   clarifies the differences as well
 - add unit tests around the behavior; this will help us in the future
   to separate flaws in our understanding from flaws in implementation
 - includes a new DummyCommunicator in tests which should be useful in
   supporting additional unit testing of this kind
 - manually tested this on squeeze, wheezy, precise, quantal, raring,
   and saucy successfully.

handles the issue in #2333
2013-11-24 11:46:12 -06:00
Mitchell Hashimoto f66d08d73c commands/plugin: style nitpick 2013-11-23 16:45:45 -08:00
Mitchell Hashimoto 63005fc1c6 Merge pull request #2420 from tmacedo/rubygems_2_compatibility
core: compatibility with rubygems 2.x
2013-11-23 16:44:10 -08:00
Mitchell Hashimoto c8be50c69e providers/virtualbox: get rid of some 4.3 global state 2013-11-23 16:30:09 -08:00
Mitchell Hashimoto 2044c7445e Merge pull request #2484 from andyfowler/virtualbox-parallel-import
provider/virtualbox: virtualbox parallel box import
2013-11-23 16:23:07 -08:00
Mitchell Hashimoto cfe17076b5 providers/virtualbox: nitpick on style 2013-11-23 16:16:45 -08:00
Mitchell Hashimoto 56eb53d8af Merge pull request #2483 from andyfowler/retryable-customize
providers/virtualbox: use Retryable for Virtualbox customize & sane_defaults actions
2013-11-23 16:12:20 -08:00
Mitchell Hashimoto b65b22cef2 update changelog 2013-11-23 16:05:44 -08:00
Mitchell Hashimoto 2a35ec425c Merge pull request #2505 from jaugustin/shell-keep-color
provisioner/shell: add keep_color option to allow custom color output
2013-11-23 16:03:15 -08:00
Mitchell Hashimoto 46d9ded812 commands/box/add: add --clean flag to ignore continuation 2013-11-23 15:55:52 -08:00
Mitchell Hashimoto 45702f9d44 Merge branch 'issue_2333' of https://github.com/elliotsegler/vagrant into elliotsegler-issue_2333
Conflicts:
	plugins/guests/ubuntu/cap/change_host_name.rb
2013-11-23 15:38:49 -08:00
Mitchell Hashimoto 97389d4255 core: output synopsis with command [GH-2249] 2013-11-23 14:00:42 -08:00
Mitchell Hashimoto 23bdbd6fd8 synced_folders/nfs: specify nfs_udp false to disable udp [GH-2304] 2013-11-23 13:43:48 -08:00
Mitchell Hashimoto 88425f0146 Merge pull request #2390 from borgstrom/master
core: allow owner & group to be supplied as an Integer and skip lookup
2013-11-23 11:46:50 -08:00
Mitchell Hashimoto a4fe547536 Merge pull request #2444 from tmatilai/debian_hostname_fix
guests/debian: Fix hostname setting also in Debian, part N
2013-11-23 11:45:38 -08:00
Mitchell Hashimoto aed61291e8 Update CHANGELOG 2013-11-23 11:45:06 -08:00
Mitchell Hashimoto 4e75e39ee5 Merge pull request #2426 from tmatilai/virtualbox_memory
providers/virtualbox: Add shortcut for setting the memory size for VirtualBox VM
2013-11-23 11:44:13 -08:00
Mitchell Hashimoto 5b71cf87f3 Merge pull request #2450 from onejli/master
guests/redhat: ifdown ethN before munging ifcfg-ethN
2013-11-23 11:40:02 -08:00
Mitchell Hashimoto 05e9dc6e59 Update CHANGELOG 2013-11-23 11:36:20 -08:00
Mitchell Hashimoto dcf57bd2cc guests/linux: increase sleep time btween NFS mount retries 2013-11-23 11:35:27 -08:00
Mitchell Hashimoto 52c27cd498 Merge pull request #2448 from rimckenn/patch-1
hosts/bsd: don't set both maproot and mapall
2013-11-23 11:34:27 -08:00
Mitchell Hashimoto 9362063623 Merge pull request #2487 from hatsuseno/master
hosts/gentoo: Restart NFS on Gentoo host instead of starting [GH-2487]
2013-11-23 11:25:42 -08:00
Mitchell Hashimoto c00b045f53 providers/virtualbox: retry suspended check [GH-2479] 2013-11-23 11:20:22 -08:00
Mitchell Hashimoto 33273ee561 Merge pull request #2529 from markpeek/markpeek-freebsd-nobashshell
guests/freebsd: Allow the FreeBSD plugin to install without bash [GH-2485]
2013-11-23 11:04:29 -08:00
Mitchell Hashimoto 0425d1712b synced_folders/nfs: config goes here 2013-11-23 10:49:51 -08:00
Mitchell Hashimoto 2c8b6ace7f providers/virtualbox: output UI 2013-11-22 19:33:17 -08:00
elliotsegler 803e78a5d4 fixing error in comment #2333 2013-11-23 10:18:59 +08:00
Mitchell Hashimoto 0b9861db7d providers/virtualbox: fix broken NFS check 2013-11-22 17:29:35 -08:00
Mitchell Hashimoto 850c9ea7a6 kernel: handle new NFS types 2013-11-22 17:22:47 -08:00
Mitchell Hashimoto 22a5430068 synced_folders/nfs: use proper error classes 2013-11-22 17:18:08 -08:00
Mitchell Hashimoto be6d4cc116 providers/virtualbox: make sure sf host paths are strings 2013-11-22 17:16:21 -08:00
Mitchell Hashimoto 35ac7da5a0 providers/virtualbox: don't use NFS middleware anymore 2013-11-22 17:13:53 -08:00
Mitchell Hashimoto 52fe93cc41 synced_folders/nfs: begin implementation (not functional) 2013-11-22 16:51:55 -08:00
Mitchell Hashimoto 9d3818a380 providers/virtualbox: use new SyncedFolders middleware 2013-11-22 16:21:14 -08:00
Mark Peek d5dcf84d62 Allow the FreeBSD plugin to install without bash [GH-2485]
The default shell is "bash -l" which does not get installed by default
on FreeBSD. This change allows the plugin to override the default shell
and use a known installed shell (sh).
2013-11-22 15:30:12 -08:00
elliotsegler a80de51054 Fixes recommended by phinze for #2333 2013-11-22 11:55:17 +08:00
Mitchell Hashimoto 97148379d2 providers/virtualbox: implement the synced folder plugin 2013-11-21 17:38:17 -08:00
Mitchell Hashimoto 504707f96a Merge pull request #2482 from andyfowler/safer-vbox-names
core: safer default VM names for Virtualbox
2013-11-21 15:01:31 -08:00
Daniel Miller 31894171d3 Make salt bootstrap work on systems without python 2013-11-21 10:42:06 -05:00
phinze 4225b0eb7b provider/virtualbox: fix bad constant reference in dhcp error
refs #2454
2013-11-20 11:15:25 -06:00
jaugustin 722e9e6afb [Provisioner][Shell] add keep_color option to allow custom color output 2013-11-16 13:34:58 +01:00
Rudolf Leermakers aa749db079 Restart NFS on Gentoo host instead of starting
In the case that NFS is already started on a Gentoo host, /etc/init.d/nfs start will not reload exports, but fail. /etc/init.d/nfs reload is known to fail for some esoteric configurations of /etc/exports, restart should be safe for existing connections.
2013-11-11 12:30:40 +01:00
Andy Fowler b13122cab7 use Retryable for virtualbox customize + defaults
when up-ing several boxes at once, VBoxManage modifyvm gets cranky and throws random lock errors. this adds the existing retryable logic to
the customize and sane_defaults actions, both of which fire a bunch of
modifyvm commands, all of which are fine to run multiple times.
2013-11-09 18:16:47 -05:00
Andy Fowler d775756d18 use a safer default name for virtualbox
if the same vagrantfile is up'd in the same second in the same basedir
this caused a conflict,

most notably, all jenkins jobs sit in a 'workspace' directory, which
breaks if more than one job launches from the same trigger.
2013-11-09 15:54:46 -05:00
Andy Fowler 2e9286b4d3 use vbox4.2 driver parallel-safe box import in 4.3
uses what @smoyer did for vbox 4.2 in vbox 4.3,
tested against VBoxManage 4.3.2
2013-11-08 12:48:37 -05:00
Scott Moyer c2a3a30e35 Update the virtualbox driver to import base boxes into a unique(ish) VM folder to prevent collisions. 2013-11-07 17:07:29 -05:00
Jonathan Li 1ad756d52c ifdown ethN before munging ifcfg-ethN (i.e. removing previous vagrant config for network interface) 2013-11-02 12:35:37 -07:00
rimckenn 3047b81256 Update host.rb
mapall= and maproot= are mutually exclusive options. Currently, when trying to use maproot=, mapall= is getting automatically added, which prevents us from using the NFS mount. This change turns off the adding of mapall= if maproot= has been specified as an option.
2013-11-01 14:44:49 +00:00
Teemu Matilainen 2073a1a939 Fix hostname setting also in Debian, part N
Port #2384 / #2383 for Debian guests.
2013-10-31 21:39:45 -03:00
Fabio Rehm 48875124b9 commands/box: Read box URL and downloaded date from JSON 2013-10-29 13:09:24 -02:00
Fabio Rehm 05a8cf523a core: Get rid of code that deals with box info on a separate statefile 2013-10-29 13:09:24 -02:00
Fabio Rehm 18cf66e83a commands/box: List base box downloaded URL and datetime when `-i` gets provided to `box list` 2013-10-29 13:09:24 -02:00
Fabio Rehm cbc7e7eedb commands/box: Preparing to display additional box information on `box list` 2013-10-29 13:09:23 -02:00
Fabio Rehm 031119a858 commands/box: Extract a base class for dealing with StateFile instantiation 2013-10-29 13:09:23 -02:00
Fabio Rehm 1c689d2211 core: Remove box information from state file after box removal 2013-10-29 13:09:23 -02:00
Fabio Rehm e4b5db829e commands/box: Extract box removal code from `box remove` command into a builtin action 2013-10-29 13:09:23 -02:00
Fabio Rehm 17fd5f9e4e commands/box: Introduce a StateFile for keeping track of downloaded boxes 2013-10-29 13:09:23 -02:00
Teemu Matilainen 3368ef610a Add shortcut for setting the memory size for VirtualBox VM 2013-10-28 00:43:33 -03:00
Tiago Macedo 2d66d94ebe compatibility with rubygems 2.x 2013-10-25 11:27:17 +02:00
Mitchell Hashimoto 2ca350c816 Merge pull request #2400 from hikch/master
guests/freebsd: fix nfs mount fail with FreeBSD9.1 (synced_folder).
2013-10-23 23:15:33 -07:00
Mitchell Hashimoto af66984ca1 Merge pull request #2404 from canausa/patch-1
commands/provision: add --no-parallel
2013-10-23 23:13:04 -07:00
Stephan Meissl 889233ed94 Automatically enable symlinks on vboxsf for VirtualBox 4.1 (see #713 and 387692f9c8). 2013-10-23 23:00:07 +02:00
canausa 10883b3be6 Add --no-parallel to provision 2013-10-21 10:19:42 -04:00
Heikichi Umehara c0eb9bd35a fix nfs mount fail with freebsd. 2013-10-21 08:42:57 +09:00
Evan Borgstrom 9c8ead1ca3 Restore correct pathing 2013-10-17 22:45:23 -04:00
Evan Borgstrom ebb85b57fd Allow owner & group to be supplied as an Integer and skip lookup 2013-10-17 22:40:21 -04:00
Mitchell Hashimoto 673a06b54d hosts/gentoo: use subprocess machinery
/cc @timgus
2013-10-17 08:32:09 -10:00
Mitchell Hashimoto 7a99e7a62e Merge pull request #2382 from timgus/gentoo_systemd
hosts/gentoo: recognize systemd for nfsd startup and replace "service" command with /etc/init.d/nfs
2013-10-17 11:29:28 -07:00
Nathan Mische 0c238741d3 Fixing so localhost hosts file entry is not lost when updating hostname. Addresses Issue #2383. 2013-10-17 12:56:59 -04:00
Tim Gus 7bfc3ea16e hosts/gentoo: recognize systemd for nfsd startup and
replace "service" command with /etc/init.d/nfs
2013-10-17 11:11:59 -04:00
Mitchell Hashimoto b2070eec53 providers/virtualbox: Support VirtualBox 4.3 [GH-2374] 2013-10-15 11:42:22 -10:00
Teemu Matilainen 330f72eae2 Fix hostname setting also in Debian
Same fix as #2334.
2013-10-15 15:57:40 -03:00
Teemu Matilainen 535eb35206 Use old name instead of hard coded 'precise64' 2013-10-15 15:57:15 -03:00
Mitchell Hashimoto f988db97bd Merge pull request #2334 from elliotsegler/issue_2333
guests/ubuntu: Hostname and FQDN should be done in one line
2013-10-14 20:21:53 -07:00
Mitchell Hashimoto 2be01284ea provisioners/chef: fix exception during node cleanup [GH-2345] 2013-10-14 17:12:49 -10:00
Mitchell Hashimoto 4f8b751c4c Merge pull request #2347 from dougm/esxi-guest
guests/esxi: Add support for VMware ESXi guests
2013-10-14 20:09:25 -07:00
Mitchell Hashimoto cfd81da97e Merge pull request #2359 from viq/patch-1
provisioners/salt: fix seed_master key file name
2013-10-14 20:06:51 -07:00
Mitchell Hashimoto cb74d208ea Merge pull request #2358 from sgronblo/disallow_dots_and_hyphens_at_start_of_hostname
core: disallow dot and hyphen as first character of hostnames
2013-10-14 19:59:22 -07:00
Gilles Cornu 5aff4a1f20 Ansible: Improvements for 'extra_vars' argument
`extra_vars` argument can now:
- contains a hierarchical set of parameters (instead of flat Key-Value Pairs)
- alternatively refers to a configuration file (instead of embedded Hash)

See Ansible Documentation for version requirement details:
http://www.ansibleworks.com/docs/playbooks_variables.html#passing-variables-on-the-command-line
2013-10-12 00:29:39 +02:00
Tomdarkness 27c7243219 Move exception raising back into retryable block in VirtualBox driver command execution
By moving the exception throwing back into the retryable block it actually enables the retryable to function properly by retrying, if appropriate, when an certain exception is raised.
2013-10-11 18:32:54 +01:00
viq fee0f8d8ab Fix seed_master key file name
As per https://github.com/saltstack/salty-vagrant/pull/98 and https://github.com/saltstack/salty-vagrant/issues/97 the expected file name for minion is 'minion', not 'seed-minion.pub'
2013-10-10 13:04:31 +02:00
Sam Gronblom 9a7ca06cfa Disallow dot and hyphen as first character of hostnames
- Causes hostname to be set to an invalid value on some systems which
  also causes malfunction of hostname -f so it cannot be changed
2013-10-10 14:42:48 +09:00
Doug MacEachern 6c9edbbdc6 guests/esxi: Add support for VMware ESXi guests 2013-10-08 21:47:32 -07:00
Laurent Raufaste 157a7081ba Update boundary usage in the sed regexp to update the hosts file 2013-10-08 20:14:22 -04:00
Elliot Segler 06aaa6e6ea #2333, more fixes - right order to get fqdn right 2013-10-08 17:53:27 +08:00
Elliot Segler 1abcf1e54f Better fix for issue #2333, does localhost as well so we dont break local name resolution for things like puppet 2013-10-08 17:01:54 +08:00
Elliot Segler 9ca6fbe8f4 Hostname and FQDN should be done in one line 2013-10-06 15:33:00 +08:00
Mitchell Hashimoto 193f172b7c Merge pull request #2313 from jeffasinger/salt-overstate
provisioner/salt: adding overstate support to the salt provisioner
2013-10-05 11:46:01 -07:00
Mitchell Hashimoto 4049fd136f Merge pull request #2329 from mpioli/redhat
guests/redhat: create from fedora guest (migrate)
2013-10-05 11:43:42 -07:00
Matthew e9903422cc detect Red Hat Enterprise Linux 4 and Oracle Linux 2013-10-05 18:01:27 +01:00
Matthew b16d56c717 rename host plugin (fedora to redhat) 2013-10-05 17:40:23 +01:00
Matthew d1871b5c15 do not use systemd on current versions of CentOS or RHEL 2013-10-05 17:33:13 +01:00
Matthew Johnson b514f0c321 remove extra alias for vvv verbosity 2013-10-04 15:32:10 -04:00
Matthew Johnson e5a2f1e8b7 fix ansible-playbook runs when verbosity is not specified 2013-10-04 02:58:49 -04:00
Jeff Singer 852812f778 Adding overstate support to the salt provisioner 2013-10-03 15:28:35 -04:00
egghead 4f1a65f74b fixing default verbosity 2013-10-02 02:28:55 +00:00
Mitchell Hashimoto 6fc0f03865 Merge pull request #2275 from jabclab/ansible-buffering
Resolving #2194 (Ansible buffering output if run as subprocess)
2013-10-01 14:26:25 -07:00
Mitchell Hashimoto 9fcc89bcf1 provisioners/chef: use real variable in delete from chef sever [GH-2300] 2013-10-01 14:13:16 -07:00
Mitchell Hashimoto d052069eb7 Merge pull request #2273 from czi/fix/master/my_contribution
guests/suse: Update CFEngine provisioners plugin for SuSE install compatibility
2013-10-01 11:43:10 -07:00
Ian Heggie 4f11716633 Remove old /tmp/bootstrap_salt.sh before uploading as it may not be writeable 2013-09-29 21:05:59 +10:00
jabclab c51952a68d Resolving #2194 (Ansible buffering output if run as subprocess) 2013-09-26 10:13:44 +01:00
U-quartz\Cory ecb6ebaf81 add cfengine provisioner suse install support 2013-09-25 20:29:25 -05:00
Mitchell Hashimoto d970c4e03f Merge pull request #2254 from Caustic/fix-hostname-debian
guests/debian,ubuntu: Fixed fqdn handling
2013-09-25 10:36:33 -07:00
François Charlier c1228ae206 Allow to change the DHCP_HOSTNAME on RedHat 2013-09-24 23:48:10 +02:00
Mitchell Hashimoto 33dd881ad7 provisioners/chef: disable color if Vagrant has no color [GH-2246] 2013-09-22 14:15:55 -05:00
Alan Braithwaite 7d53047a92 Fixed fqdn handling on debian/ubuntu
The issue was that the old method simply didn't work.  When the hosts
file should look like:
    127.0.1.1   host.fqdn.com host
It looked like:
    127.0.1.1   host.fqdn.com host old.fqdn.com old
Or this if the user didn't set a fqdn
    127.0.1.1   host host old.fqdn.com old

This patch fixes that.
2013-09-22 00:33:24 -07:00
Pete Michaud e65ac705b4 fixed missing backtick 2013-09-21 21:41:06 -05:00
Mitchell Hashimoto 36bd52713b provisioners/ansible: convert extra vars to strings [GH-2244] 2013-09-20 21:16:50 -07:00
Mitchell Hashimoto 7df64dff0c Merge pull request #2242 from bt5e/move-up-chmod-in-puppet
provisioners/puppet-apply: moved chmod up before verify_shared_folders check #2241
2013-09-20 21:12:10 -07:00
Mitchell Hashimoto 79fa7000fa providers/virtualbox: don't touch DYLD_* anymore.
Subprocess handles this
2013-09-20 17:57:44 -07:00
Mitchell Hashimoto 4d03a7359e guests/linux: fail after a number of attempts 2013-09-20 17:52:36 -07:00
Mitchell Hashimoto 62e357ffcd guests/linux: only successful mount if exit status 0 2013-09-20 17:50:29 -07:00
Mitchell Hashimoto 8c4ea4f47b Update CHANGELOG 2013-09-20 17:24:59 -07:00
Mitchell Hashimoto 5fe6d7a525 Merge pull request #2235 from aleno/shell
provisioners/shell: Don't replace Windows newlines to Unix if shell is set as binary
2013-09-20 17:23:48 -07:00
Ben Tse cd79563837 #2241 moved chmod up before verify_shared_folders check 2013-09-19 14:26:35 -04:00
Alexander Norström b20fe8d41e Dont replace Windows newlines to Unix if shell is set as binary 2013-09-19 13:33:58 +02:00
viq 8fd2337038 Fix invocation of initialize
Fixes #2229 for me
2013-09-19 11:55:46 +02:00
Mitchell Hashimoto f9e4ea9ce8 communicators/ssh: timeout waiting for connection + header [GH-2226] 2013-09-18 09:32:30 -07:00
keyist 8cc5b4ddb5 hosts/arch: remove duplication with HostsLinux 2013-09-16 21:27:15 -07:00
Mitchell Hashimoto ee9fc00a04 provisioners/ansible: default output level is verbose [GH-2194] 2013-09-16 21:02:22 -07:00
Mitchell Hashimoto b9801f44a0 guests/linux: try `id -g` to determine group as well [GH-2197] 2013-09-16 20:51:09 -07:00
Mitchell Hashimoto 93f2e9ebbb communicators/ssh: increase conect timeout [GH-2163] 2013-09-15 17:37:40 -07:00
Mitchell Hashimoto 5e468dd110 core: Convert FP ports to ints [GH-2173] 2013-09-15 17:29:49 -07:00
Mitchell Hashimoto cf5d1f40e0 Merge pull request #2191 from Raman148/fix/master/exportssecurity
hosts/bsd: use `sudo` not `su` for NFS export writing
2013-09-15 16:46:53 -07:00
Mitchell Hashimoto a36f06f28f Update CHANGELOG 2013-09-15 16:39:54 -07:00
Mitchell Hashimoto 1900f5ecc2 Merge pull request #2200 from mikerowehl/virtualbox_destroy_unused_interfaces_fix
providers/virtualbox: call rest of destroy middleware stack
2013-09-15 16:37:36 -07:00
Mitchell Hashimoto 77bd296a07 Merge pull request #2203 from copperlight/ansible-host-key-checking
provisioners/ansible: add ansible.host_key_checking configuration parameter
2013-09-15 16:35:45 -07:00
Jurnell Cockhren 624a9dd2fd need_configure should return true when master_config is defined as well.
This fixes #2204 and fixes saltstack/salty-vagrant#100
2013-09-14 09:49:37 -05:00
Matthew Johnson 131ce4fc97 add ansible.host_key_checking configuration parameter 2013-09-13 22:48:12 -04:00
Mike Rowehl 251cafe5e4 Call the rest of the middleware stack all the time. 2013-09-13 09:34:40 -07:00
Raman Nanda 1566280061 Cleanup for Pull Request 2013-09-11 17:57:54 -04:00
Raman Nanda 0c03ad18fc Updating for NFS Fix 2013-09-11 17:22:13 -04:00
David d3ab29e279 Put nfs opts setup in separate function and configured to be called by both generic linux and arch nfs_options. Fixes undefined method join exception in arch 2013-09-10 11:39:41 -04:00
Marc Schlaich 42e41eecc9 Removed duplicate entry. 2013-09-09 11:17:04 +02:00
Mitchell Hashimoto 8a9ee5d8dc hosts/arch: correct variable for NFS exports [GH-2161] 2013-09-07 17:49:52 -07:00
Mitchell Hashimoto 9e878b3bfb Merge pull request #2153 from gildegoma/ansible-docs-cleanup-and-vv
provisioners/ansible: Update documentation, Code Cleanup (and Extend Log Verbosity option)
2013-09-07 17:46:28 -07:00
Mitchell Hashimoto c29925a6a5 Merge pull request #2156 from gustavobgama/fix/master/linux_nfs_error
hosts/linux: fixed options to NFS: no_subtree and check became no_subtree_check
2013-09-07 17:44:25 -07:00
Eric G. Wolfe 1186c86718 [GH-1977] revert and alternate fix
@mitchellh, the internal encoding doesn't seem to work.  Therefore,
I reverted that previous change to vagrant.rb.

However, I found two alternate solutions.  Either transcoding,
`/etc/redhat-release` to ISO-8859-1 on open, or using something
like File.binread to transcode the file contents to raw.
2013-09-07 13:40:23 -04:00
Gustavo Gama 693b813d63 Fixed options to NFS: no_subtree and check became no_subtree_check 2013-09-07 12:09:09 -03:00
Gilles Cornu ce4f2824f4 Ansible: Support three available verbosity levels 2013-09-07 15:17:43 +02:00
Gilles Cornu 8a925e3461 Ansible: code cleanup and documentation update
Clean Up (code logic is kept unmodified):
* Remove repetition around `ansible.limit` option (merge conflict issue)
* Re-add missing comments from GH-1697 (merge conflict issue)
* Reorder instructions

Documentation for following changes:
* [GH-1697] add more options
* [GH-1979] extra verbosity option
2013-09-07 14:49:12 +02:00
Mitchell Hashimoto 517ac20822 guests/coreos: proper guest IP detection [GH-2146] 2013-09-06 11:30:53 -07:00
Mitchell Hashimoto bad4c78766 hosts/linux: fix undefined variable in NFS export [GH-2137] 2013-09-06 08:54:02 -07:00
Mitchell Hashimoto 0879c1d624 provisioners/chef: fix syntax error 2013-09-05 23:59:11 -07:00
Mitchell Hashimoto a06742b8ef provisioners/chef: env config less restrictive 2013-09-05 16:34:21 -07:00
Mitchell Hashimoto e05cca7ed4 provisioners/puppet: sudo test for folders for umask 2013-09-05 16:24:30 -07:00
Mitchell Hashimoto 592a800f84 provisioners/chef: work with restrictive umask [GH-2121] 2013-09-05 16:12:56 -07:00
Mitchell Hashimoto 1769fbcba8 core: dup option hashes everywhere 2013-09-05 14:26:53 -07:00
Mitchell Hashimoto 0b94ed44b7 core: dup the synced folder options [GH-2134] 2013-09-05 14:25:38 -07:00
Mitchell Hashimoto d4e6372fa7 provisioners/chef: chown/create folder before access [GH-2121] 2013-09-04 20:43:22 -07:00
Mitchell Hashimoto 4c35f6d071 core: exec with the proxy command if specified 2013-09-04 17:23:43 -07:00
Mitchell Hashimoto 763bdc42f4 Merge pull request #1537 from wormzer/master
communicator/ssh: Additional proxy_command option
2013-09-04 17:18:59 -07:00
Mitchell Hashimoto f82711259c provisioners/all: report proper invalid keys [GH-2117] 2013-09-04 16:57:15 -07:00
Mitchell Hashimoto 51bdae3b90 Merge pull request #2112 from markpeek/markpeek-file
Add a file provisioner
2013-09-03 14:09:10 -07:00
Mark Peek c158b4aff4 Add a file provisioner
Add a provisioner which will upload host files and directories to the
guest via the scp channel. This is useful for populating user specific
files into the guest. This is a rename from scpupload to file and updated
against master. [GH-1357]
2013-09-03 11:03:46 -07:00
Mitchell Hashimoto 3154669835 provisioners/shell: prefer "." over "::"
/cc @fgrehm
2013-09-03 10:44:16 -07:00
Mitchell Hashimoto c752c37586 Merge branch 'shell-provisioner-remote-script' of https://github.com/fgrehm/vagrant into fgrehm-shell-provisioner-remote-script
Conflicts:
	CHANGELOG.md
2013-09-03 10:40:24 -07:00
Mitchell Hashimoto 89ecb7850f Merge branch 'more_ansible_options' of https://github.com/gildegoma/vagrant into gildegoma-more_ansible_options
Conflicts:
	plugins/provisioners/ansible/provisioner.rb
2013-09-02 15:30:49 -07:00
Mitchell Hashimoto 154b32e561 Merge pull request #1745 from jheise/master
providers/virtualbox: static ip addresses on public networks
2013-09-02 15:10:33 -07:00
Mitchell Hashimoto b8dc881792 commands/up: validate provision-with args [GH-1957] 2013-09-02 15:06:03 -07:00
Mitchell Hashimoto e8d2e05c4e Merge pull request #2077 from miurahr/exportfs
Improvement of Linux supports and NFS handling using exportfs
2013-09-02 14:52:59 -07:00
Mitchell Hashimoto ac1404b9ac commands/plugin: Add "update" subcommand 2013-09-02 09:31:26 -07:00
Mitchell Hashimoto c95a68ed5d commands/reload: dont' provision by default 2013-09-02 09:13:22 -07:00
Mitchell Hashimoto a656a99654 communicators/ssh: remove use of nonexistent config 2013-09-02 09:11:39 -07:00
Mitchell Hashimoto 63d0400de7 kernel_v1: don't upgrade "max_tries" and "timeout" because they're gone 2013-09-02 09:09:39 -07:00
Mitchell Hashimoto e2ddab532d core: Don't provision after first `up` by default [GH-1776] 2013-09-02 09:03:46 -07:00
Mitchell Hashimoto ab7cee1ae0 Merge pull request #2107 from fgrehm/remove-dead-code
core: Remove dead code from Guest
2013-09-01 13:47:18 -07:00
Mitchell Hashimoto 7897de3fbd guests/ubuntu: enable the new mount_nfs stuff 2013-09-01 13:46:09 -07:00
Mitchell Hashimoto 8bc01c7cb1 Merge pull request #1717 from toretore/master
guests/ubuntu: Emit Ubuntu Upstart 'vagrant-mounted' (regression)
2013-09-01 13:43:26 -07:00
Fabio Rehm 77dd626341 guest: Remove dead code 2013-09-01 17:41:17 -03:00
Mitchell Hashimoto d7b398a905 Merge branch 'fix/master/puppet-provisioner-nfs-support' of https://github.com/mfournier/vagrant into mfournier-fix/master/puppet-provisioner-nfs-support
Conflicts:
	CHANGELOG.md
	plugins/provisioners/puppet/provisioner/puppet.rb
2013-09-01 13:32:49 -07:00
Mitchell Hashimoto 3a14d27f90 core: Arbitrary NFS options with nfs_options [GH-1029] 2013-09-01 13:08:02 -07:00
Mitchell Hashimoto df02ddb68c core: note backwards incompat in code 2013-09-01 12:27:15 -07:00
Mitchell Hashimoto e5b35d1c83 core: support "mount_options" for arbitrary mount options [GH-1029] 2013-09-01 12:25:21 -07:00
Mitchell Hashimoto 2d2180e5a5 hosts/linux: fix NFS prune regex 2013-09-01 12:00:36 -07:00
Mitchell Hashimoto a6aa16dcad hosts/bsd: proper NFS prune sed syntax 2013-09-01 11:58:52 -07:00
Mitchell Hashimoto 65ef8d2477 Merge branch 'nfs-per-user' of https://github.com/davedevelopment/vagrant into davedevelopment-nfs-per-user
Conflicts:
	plugins/hosts/arch/host.rb
	plugins/hosts/bsd/host.rb
	plugins/hosts/linux/host.rb
	templates/nfs/exports.erb
	templates/nfs/exports_freebsd.erb
	templates/nfs/exports_linux.erb
2013-09-01 11:44:00 -07:00
Mitchell Hashimoto c63d4fd6b8 hosts/bsd: nice error if can't read exports file [GH-2038] 2013-09-01 10:25:00 -07:00
Mitchell Hashimoto a96efcdec9 providers/virtualbox: only set default name on first up [GH-1817] 2013-08-31 22:43:33 -07:00
Mitchell Hashimoto 9e38601f18 provisioners/puppet: run from correct working directory [GH-1967] 2013-08-31 22:24:30 -07:00
Mitchell Hashimoto 949416c76c provisioners/ansible: use proper config name [GH-2104] 2013-08-31 21:48:41 -07:00
Mitchell Hashimoto c4e79db552 commmands/box/remove: fix exception when no provider specified [GH-2100] 2013-08-30 09:43:35 -07:00
Mitchell Hashimoto e5db091b1c provisioners/salt: default bootstrap script gets latest 2013-08-29 17:40:59 -07:00
Mitchell Hashimoto 874994ff73 provisioners/salt: remove unused code 2013-08-29 17:26:52 -07:00
Mitchell Hashimoto d154aafc0d provisioners/salt: remove vagrant check, we core now 2013-08-29 17:08:49 -07:00
Mitchell Hashimoto 93d5182230 Merge pull request #1626 from raadad/salty-vagrant-provisioner
Salt provisioner.
2013-08-29 17:06:16 -07:00
Mitchell Hashimoto c38d28f1c5 providers/virtualbox: 4.2 max network adapters to 36 [GH-1886] 2013-08-29 16:50:20 -07:00
Mitchell Hashimoto 0f4ba6dc3b providers/virtualbox: Run post-boot after boot but before wait for SSH
[GH-2048]
2013-08-29 16:44:32 -07:00
Fabio Rehm 47594036b4 Add support for remote shell provisioner script 2013-08-29 20:44:14 -03:00
Mitchell Hashimoto 5a4c06f75e core: config.ssh.timeout => config.vm.boot_timeout 2013-08-29 16:41:36 -07:00
Mitchell Hashimoto c38fadfd2f core: config.vm.graceful_halt_timeout to specify graceful halt timeout 2013-08-29 16:38:02 -07:00
Mitchell Hashimoto 261d0ef6cd core: WaitForCommunicator - more robust wait for boot
This is a new built-in middleware that is more robust for
waiting for boots. The "max_tries" configuration is now gone, it is
timeout based. Future commits will make this even better as the
SSH communicator will implement the new "wait_for_ready" in a better
way.
2013-08-29 16:27:00 -07:00
Mitchell Hashimoto 2b7a1297c8 core: set `disabled: true` for disabling forwarded port [GH-1922] 2013-08-29 12:25:53 -07:00
Mitchell Hashimoto c2012ff944 commands/up: flag --no-destroy-on-error [GH-2011] 2013-08-29 12:13:02 -07:00
Mitchell Hashimoto 9e476330f4 provisioners/ansible: execute ansible with cwd of root_path [GH-2051] 2013-08-29 11:55:58 -07:00
Mitchell Hashimoto 1ac3fb39fc provisioners/chef: error if knife not found and auto-deleting 2013-08-29 11:36:37 -07:00
Mitchell Hashimoto 26b32bf8cd provisioners/chef: don't delete node/client by default 2013-08-29 11:27:00 -07:00
Mitchell Hashimoto a8ebd30cb9 provisioners/chef: use Subprocess to execute knife 2013-08-29 11:26:21 -07:00
Mitchell Hashimoto d4c7e20110 core: ProvisionerCleanup task to run cleanup on provisioners 2013-08-29 11:13:43 -07:00
Mitchell Hashimoto 93c98aad01 Merge branch 'pr/1267'
Conflicts:
	plugins/provisioners/chef/provisioner/chef_client.rb
2013-08-29 10:50:50 -07:00
Mitchell Hashimoto 50fdf1358c communicators/ssh: handle closed connection without exception 2013-08-29 10:36:23 -07:00
Mitchell Hashimoto 54ac2e8448 Merge pull request #1713 from akalyaev/respect-nec-type-option-for-private-networks-1704
core: respect :nic_type option for private network. Fixes #1704
2013-08-28 22:44:20 -07:00
Mitchell Hashimoto 349b2507f9 Merge branch 'unpriv_shell' of https://github.com/frsantos/vagrant into frsantos-unpriv_shell
Conflicts:
	plugins/provisioners/shell/config.rb
	plugins/provisioners/shell/provisioner.rb
2013-08-28 22:29:49 -07:00
Mitchell Hashimoto 0e9711d0dd kernel: config.vm.host_name works again 2013-08-28 17:17:07 -07:00
Mitchell Hashimoto 826c8a884d Merge pull request #1801 from davegudge/patch-1
core: use getent to get group ID
2013-08-28 17:02:46 -07:00
Mitchell Hashimoto adb72b07d5 plugins/provisioners: put generated inventory file in vagrantfile dir 2013-08-28 16:54:44 -07:00
Mitchell Hashimoto 8445308830 Merge branch 'generate_ansible_hosts' of https://github.com/commandtab/vagrant into commandtab-generate_ansible_hosts
Conflicts:
	plugins/provisioners/ansible/provisioner.rb
2013-08-28 16:52:13 -07:00
Mitchell Hashimoto 8f2f654446 Merge branch 'chef_solo_environment_support' of https://github.com/marcparadise/vagrant into marcparadise-chef_solo_environment_support
Conflicts:
	plugins/provisioners/chef/config/chef_solo.rb
2013-08-28 16:49:19 -07:00
Mitchell Hashimoto 02399a145c provisioners/ansible: allow verbose :extra to be string 2013-08-28 16:46:04 -07:00
Mitchell Hashimoto 99a51a1ba8 Merge pull request #1979 from bmabey/patch-1
provisioners/ansible: adds extra verbosity option
2013-08-28 16:45:04 -07:00
Mitchell Hashimoto 5a18be1827 Merge pull request #2052 from janth/solaris11-guest
guests/solaris11: Added solaris11 guest plugin
2013-08-28 16:38:54 -07:00
Mitchell Hashimoto 29aab20a9d core: nitpick the protocol forwarded port checking 2013-08-28 16:32:47 -07:00
Mitchell Hashimoto 44d65de076 Merge pull request #2059 from mlex/forward-tcp-and-udp-with-on-same-port-number
core: allow port-forwarding of the same port number but with different protocols [GH-1108]
2013-08-28 16:27:51 -07:00
Mitchell Hashimoto 53619daa74 Merge pull request #2086 from tsahara-iij/openbsd-caps
guests/openbsd: more capabilities for OpenBSD guest
2013-08-28 16:26:28 -07:00
Michael G. Noll 5058f351b1 GH-2087: Detect RHEL (Red Hat Enterprise Linux Server) properly 2013-08-28 09:19:08 +02:00
Michael G. Noll 95f5f553d9 GH-2088: Use proper regex capture group to detect OS version of RHEL family 2013-08-28 09:17:23 +02:00
Tomoyuki Sahara 91db685295 more capabilities for OpenBSD guest 2013-08-28 13:12:09 +09:00
Elan Ruusamäe fda6bf7bf7 fix broken regexp from 2a9d0c9 2013-08-27 22:16:37 +03:00
KATOH Yasufumi 05d27d20e4 improve slackware/plamo detection and change nfs_check_command
* On Slackware, /etc/rc.d/rc.nfsd has no "status" argument, so the check command change to pidof command.
* On Plamo Linux, there is no /etc/slackware-release file, so use "/usr/lib/setup/Plamo-*" instead.
2013-08-27 08:13:23 +09:00
Hiroshi Miura 3d886671a6 fix typo for slackware
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2013-08-25 00:10:18 +09:00
Hiroshi Miura bae7dbb0e2 Support slackware linux
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2013-08-24 22:11:22 +09:00
Hiroshi Miura f2b83ac662 export nfs gracer way in Linux
To reload /etc/exports, /sbin/exportfs is best way
to command it in standard.
It modify generic linux to check daemon status
before restart instead of restarting everytime.

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2013-08-24 22:11:22 +09:00
Michael Lex 172a5dac5a allow port-forwarding of the same port number but with different protocols [GH-1108] 2013-08-16 12:10:03 +02:00
Jan Thomas Moldung 75c03726b9 Added solaris11 guest plugin 2013-08-14 16:10:18 +02:00
Ben Mabey bb3609e6b2 adds extra verbosity option to ansible provisioner 2013-08-12 09:31:54 -06:00
Gilles Cornu b061e02bc8 Add support for "ansible.skip_tags" attribute 2013-08-12 09:41:18 +02:00
Boohbah 903578269b Use hostnamectl in plugins/guests/arch/cap/change_host_name.rb 2013-08-10 00:41:18 +00:00
Mitchell Hashimoto 53f214c451 Merge pull request #2040 from timsutton/darwin-verify-vmware-hgfs
guests/darwin: Support verify_vmware_hgfs in darwin guest.
2013-08-09 12:05:09 -07:00
Timothy Sutton caaaa9fe28 Support verify_vmware_hgfs in darwin guest. 2013-08-09 15:00:38 -04:00
Mitchell Hashimoto b6ec723426 Update CHANGELOG 2013-08-09 11:53:58 -07:00
Mitchell Hashimoto 3b1a314117 Merge pull request #2015 from flozano/master
provisioners/puppet: Puppet modules owned by root when mounted in sync'ed folder.
2013-08-09 11:53:00 -07:00
Mitchell Hashimoto d237bc0657 provisioners/ansible: properly quote vars with spaces [GH-1984] 2013-08-09 11:51:36 -07:00
Mitchell Hashimoto 602a5ce0b4 commands/plugin/install: nitpick on style
/cc @ipwnstuff - Just nitpicking and CCing you so you can see. I dislike
the "if (val = something)" syntax so I axed that. Then I simplified
logic a bit.
2013-08-09 11:26:39 -07:00
Mitchell Hashimoto 8e3422403f Merge pull request #1986 from ipwnstuff/feature/plugin-post-install-message
commands/plugin/install: Display a plugin's post install message if available
2013-08-09 11:24:19 -07:00
Mitchell Hashimoto b2f32543d9 Merge pull request #1689 from philippfranke/master
guests/suse: Add ability to configure networks
2013-08-09 11:21:26 -07:00
Mitchell Hashimoto 269f7c2cc6 Merge pull request #2007 from ches/ansible-exit-status
provisioners/ansible: Fix Ansible provisioner exit code reporting
2013-08-09 11:17:52 -07:00
Mitchell Hashimoto bb209bacc2 Merge pull request #2008 from gwenci/master
hosts/fedora: Update host.rb vagrant failing on CentOS 6
2013-08-09 11:16:30 -07:00
Mitchell Hashimoto 0dfeec4fae Merge pull request #2016 from mcourtois/fix/master/status_cosmetic
commands/status: Cosmetic fix to align machine name and states in the status command
2013-08-09 11:14:15 -07:00
Mitchell Hashimoto 8e065abf3c Merge pull request #2026 from ppp0/patch-set-hostname-debian
plugins/guests/debian: Forcing eth0 to come up
2013-08-09 11:11:57 -07:00
Mitchell Hashimoto 17ecd05c5f plugins/provisioners/ansible: rename inventory_file to inventory_path
/cc @ches
2013-08-09 11:06:02 -07:00
Mitchell Hashimoto ac8b2c5047 plugins/provisioners/ansible: use exist? check
/cc @ches
2013-08-09 11:04:35 -07:00
Mitchell Hashimoto 15142704eb Merge pull request #2035 from ches/ansible-inventory-directories
Ansible inventory can be a directory, not just a file
2013-08-09 11:03:52 -07:00
Mitchell Hashimoto d24caac5ae Merge pull request #1914 from b2jrock/darwin-guest
OS X (darwin) guest support.
2013-08-09 10:53:29 -07:00
Ches Martin c38855f8c1 Ansible inventory can be a directory, not just a file
It is an under-documented feature that one can specify a directory as
the Ansible inventory source, not just a single file. In that case,
Ansible merges the contents of flat files and any executable inventory
plugins found in the directory.

This is useful, for instance, to put localhost in your inventory for use
with `local_action` even if your entire infrastructure is otherwise on
EC2 or some other dynamic inventory source. I also use a flat file to
create aliases for host groups automatically generated from the EC2 API,
like "staging" for `tag_Environment_staging`.
2013-08-09 01:26:04 +07:00
Timothy Sutton 23962baac9 Darwin: use :sudo for communicate.test 2013-08-07 17:10:32 -04:00
Timothy Sutton a3b9428f67 Darwin: code debug cleanup 2013-08-06 10:18:38 -04:00
Timothy Sutton 8b925e6c15 Update Darwin guest description 2013-08-06 10:18:12 -04:00
Timothy Sutton 78ec8b5809 Darwin: clean up temporary network interface file downloaded from guest 2013-08-06 10:17:52 -04:00
Timothy Sutton 300d151608 Darwin guest: mount_vmware_shared_folder cap for use with vmware_fusion provider
- It's not clear whether it's possible to mount individual shares
  using 'mount -t vmhgfs', as the vagrant-vmware-fusion provider now does
  for Linux guests. Any mount from '.host', even if not a valid share
  name, succeeds and mounts _all_ shares in their respective directories
  at the root of the mountpoint. Instead, we symlink each directory from
  its place in '/Volumes/VMware Shared Folders'
2013-08-06 10:17:12 -04:00
Brian Johnson 7d0a92c5b4 Remove the +1 offset, I resolved the issue with the 'phantom' en1
interface. For some reason interfaces still skip en1, but provided we
enumerate based on order and not name, things should work smoothly.
2013-08-05 18:45:42 -07:00
Brian Johnson e5ce19ff11 Tabs must die. 2013-08-05 18:07:45 -07:00
Brian Johnson 3611ff39f4 Change mount_nfs_folder cap to be more like the linux version, adding a
bunch of retires rather than a long sleep.

Add DarwinNFSMountFailed error. This might move be more appropriate at
the plugin level.

Integrate some of tvsutton's work in configure_networks to get the
implementation closer to working in both fusion and virtualbox.

Add shell_expand_guest_path capability (also copied from linux)
2013-08-05 17:39:44 -07:00
Philipp Gysin b6f2443bd5 Forcing eth0 to come up 2013-08-05 18:02:12 +02:00
Artur Roszczyk bf21021cfc Cleanup of CoreOS guest plugin 2013-08-04 02:15:37 +02:00
Artur Roszczyk c8cd47ff6d Make slaves connecting to first node 2013-08-03 22:53:31 +02:00
Artur Roszczyk d8c10ad901 LVP for coreos guest support 2013-08-03 20:31:42 +02:00
Artur Roszczyk 5010738043 Improve Gentoo guest detection 2013-08-03 19:55:17 +02:00
Marc-André Courtois ed03add533 Start padding with 25 characters to keep original behavior 2013-08-01 13:23:18 -04:00
Marc-André Courtois 97aed37aea Use longest machine name to pad in status cmd 2013-08-01 13:17:55 -04:00
Francisco A. Lozano 521a5c5829 Added :owner => root to mount options 2013-08-01 14:46:03 +02:00
Brian Johnson 5606aa8b1e Working implementation with NFS, still some caveats:
- There's a lengthy sleep in there, probably could use a back-off loop
- en1 seems totally worthless on vbox, I skip it and just use the en2 it creates.
2013-07-31 18:07:04 -07:00
gwenci 2a9d0c9d7f Update host.rb
Vagrant has been failing to run on CentOS 6 since version 1.2.5.
The read of file /etc/redhat-release appeared to be only checking for the word Fedora. Altered the regex to match CentOS as well
2013-07-30 18:00:08 +01:00
Ches Martin d937cca495 Fix Ansible provisioner exit code reporting
In eb70c0d6bb we were trying to compare a Subprocess::Result to a
Fixnum, resulting in Vagrant always reporting failure regardless of
Ansible's exit code.
2013-07-30 19:25:15 +07:00
Mitchell Hashimoto e1c0c48ffa Show the correct installed plugin [GH-1834] 2013-07-28 21:38:48 -07:00
Michael Glass a2a88118de removing dead code
concept introduced in 59282ba999 was removed in 28de46f3b4
2013-07-28 16:07:20 -07:00
Mitchell Hashimoto 2282a88f3d Convert config.vm.hostname to string [GH-1999] 2013-07-28 12:08:49 -07:00
Mitchell Hashimoto 6c4592ad64 Use --color=false for Puppet no color [GH-2000] 2013-07-28 12:07:48 -07:00
Mitchell Hashimoto aeb1fa7ecb unnecessary '!' 2013-07-27 22:21:37 -07:00
Mitchell Hashimoto 632349710e Convert hostpath to string on windows so gsub works 2013-07-27 22:20:55 -07:00
Erran Carey 2033eba2d4 Display post install messages if a plugin has any 2013-07-26 01:50:35 -05:00