Commit Graph

1779 Commits

Author SHA1 Message Date
Mitchell Hashimoto bd94fbd9ba Merge pull request #4274 from sax/smartos_rsync
guests/smartos: rsync on SmartOS should use pfexec
2014-08-05 17:20:38 -07:00
Mitchell Hashimoto 98667f06c8 Merge pull request #4282 from Mayflower/feature/config-box_server_url
core: add config.vm.box_server_url setting
2014-08-05 17:19:12 -07:00
Gilles Dubreuil bd4d4284c4 Fixes Fedora 20 network issues when virtual
On Fedora 20 virtual machines biosdevname command
'Returns 4 if running in a virtual machine.'

This patch:
  - Uses the biosdevname command return value to detect if virtual
  - Uses /sys/net to get interface names - Might be better solution
  - Leaves unchanged the original 'bare metal' case - I wonder what for
    though?

Tested with Fedora Cloud image adapted for vagrant-libvirt

Fixes issue #4104
2014-08-05 13:19:51 +10:00
Franz Pletz 6def193567 Add config.vm.box_server_url setting
This commits adds a new config setting `config.vm.box_server_url` to set
the URL of a local VagrantCloud instance in the Vagrantfile. If the
environment variable `VAGRANT_SERVER_URL` is set, it will still be
preferred.
2014-08-01 14:38:55 +02:00
Eric Saxby 0cb7ec2d52 rsync on SmartOS should use pfexec 2014-07-31 14:41:06 -07:00
Shawn Neal 5c148e44c3 Merge pull request #4102 from mitchellh/windows-guest-rename-compat
Addressed issues with Windows guest renaming on Win7/8
2014-07-10 13:30:15 -07:00
Shawn Neal 99a537605c Fixed issue 4161
Wrong varaible name was used to try and delete the existing Vagrantfile causing an error.
2014-07-08 13:19:43 -07:00
Keith Shook 93f84f53e5 Ensure VirtualBox virtual disks are stored in the correct directory round 2 2014-07-02 10:08:44 -04:00
Keith Shook 0912ddaf5f Ensure VirtualBox virtual disks are stored in the correct directory on Windows hosts 2014-07-02 08:55:00 -04:00
Akzhan Abdulin bf2e8deebe VirtualBox driver should replace only last occurence of suggested VM name. 2014-07-02 08:52:31 -04:00
jdmulloy 50d0861de4 Removed extra n from the word "connection"
Removed extra n from the word "connection" in "Attempting SSH connection" in logger call.
2014-06-27 19:27:23 -04:00
Shawn Neal 911406ed4a Addressed issues with Windows guest renaming on Win7/8
Removed dependency upon netdom which is not always available on all Windows versions. This implementation that uses PowerShell and WMI should work on all OS and PowerShell versions.

Fixed another issue where host renames would always happen when the hostname was longer than 15 characters. The COMPUTERNAME environment variable only returns the first 15 characters so we no longer use that to check the current host name.
2014-06-25 12:15:01 -07:00
Brett Porter 0c7c143ad1 fix escaping of powershell variable
As this is nested in a powershell variable $command, it must be escaped
otherwise it is evaluated when the variable is created, giving an error that
"The term 'True' is not recognized as the name of a cmdlet, function,
script". This prevented using a puppet.working_directory on Windows.
2014-06-18 16:05:17 +10:00
Mitchell Hashimoto 0c3d677bf5 Merge pull request #4006 from mitchellh/fix-issue-3987
guests/windows: reboot after hostname change
2014-06-12 11:40:22 -07:00
Mitchell Hashimoto 4d76327382 guests/freebsd: style 2014-06-12 11:38:53 -07:00
Calvin Hendryx-Parker eda1ac5667 Updated the rsync freebsd plugin install process for FreeBSD 10 2014-06-10 15:07:50 -04:00
Shawn Neal d4bd05883d Fixed issue 3987
Reboot the Windows guest after renaming the computer so changes take affect immediately before attempting to provision the box.

- Changed rename from wmic to netdom since netdom seems to work correctly in Windows 2008R2 and newer OSs.
- Fixed Windows guest error translations, the wrong namespace was specified in the yaml file.
2014-06-09 22:46:03 -07:00
Doug MacEachern 3b1b3d0a00 Add nixos guest capability: nfs_client_installed 2014-06-05 17:53:32 -07:00
Mitchell Hashimoto 984bea0bd4 Merge pull request #3962 from StefanScherer/fix_hosts_windows_cap_rdp
hosts/windows: fixed writing rdp file on windows host
2014-06-02 22:08:13 -07:00
StefanScherer 1b32cbade2 fixed writing rdp file 2014-06-03 06:57:14 +02:00
Ben Hines 7d52f0e14d Backtick-escape the facter env command in powershell. Fixes issue 3958 2014-06-02 19:37:29 -07:00
Shawn Neal 291f01045b Fixed issue 3918
Running Windows guest commands through a scheduled task were not returning the correct exit codes, they were only returning 1 or 0. This has negative consequences especially for Puppet which can return an exit code of 2 for partial success.

Since we're running an executable from inside a powershell encoded command we need to ensure we explicitly propagate the exit code to the original caller just like a regular PowerShell script - in this case cmd /c which in return is called from a scheduled task.
2014-05-28 08:54:36 -07:00
Emiliano Ticci 6bd7359c1b provisioners/puppet: run in elevated mode on Win guests 2014-05-26 11:23:14 +02:00
Matt Behrens ef44f19601 drop `-r` flag from `xargs` on OS X
OS X's `xargs` does not support the `-r` flag (which means "do not
execute the command even once if there are no arguments"), but
behaves by default as if it was specified.

You can verify this yourself with this test:

    $ touch zero-length-file
    $ xargs echo <zero-length-file

If `echo` is executed, you will see a blank line.  If it is not
executed (i.e. `-r` is specified or the behavior is implied) then
you will see no blank line.
2014-05-25 18:42:40 -04:00
Mitchell Hashimoto f99b2bac5d comamnds/box/add: change help text 2014-05-25 12:54:48 -07:00
Adam Spiers 930254c304 make init --help text more accurate 2014-05-24 20:38:24 +01:00
Adam Spiers a87cfbeea2 make box add --help text more accurate
Fixes #3898.
2014-05-24 20:37:47 +01:00
Mitchell Hashimoto ac7012279c commands/box/add: clarify help text 2014-05-24 11:24:25 -07:00
Mitchell Hashimoto 6369d870d8 providers/docker: support for UDP forwarded ports [GH-3886] 2014-05-23 10:16:16 -07:00
Mitchell Hashimoto aa70a816a5 Merge pull request #3874 from gpurkins/sol11-networkfix
guests/solaris11: Added conditional for temporary interfaces
2014-05-22 10:22:30 -07:00
Mitchell Hashimoto 43f347a737 hosts/windows: RDP cap shouldn't remove tempfile [GH-3875] 2014-05-22 10:20:45 -07:00
Kalman Hazins bb052366f7 Change symbols inside hashes to 1.9 JSON-like syntax 2014-05-22 12:35:12 -04:00
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