Mitchell Hashimoto
a6c0989bc6
Revert "Merge pull request #4616 from crypt1d/master"
...
This reverts commit aec69c4627
, reversing
changes made to 88754d2904
.
2014-10-23 09:30:46 -07:00
Mitchell Hashimoto
aec69c4627
Merge pull request #4616 from crypt1d/master
...
Consider the host_ip value when handling port collisions
2014-10-23 09:26:31 -07:00
Mitchell Hashimoto
fb5aefe41e
Merge pull request #4619 from dlundgren/master
...
Don't update the NFS exports file [GH-4148]
2014-10-23 09:21:20 -07:00
Mitchell Hashimoto
bab9e979b7
Merge pull request #4621 from awusizok/fix/master/2905-static-solaris11-addresses
...
guests/solaris: Solving #2905 - Restarting Solaris 11 boxes with static ip addresses
2014-10-23 09:20:10 -07:00
Mitchell Hashimoto
4a9d99ef71
Merge pull request #4641 from dimbleby/smb_share_error
...
Provide output on raising LinuxMountFailed
2014-10-23 09:18:20 -07:00
Mitchell Hashimoto
381f1332c8
Merge pull request #4670 from gildegoma/dry-check-ssh-perms
...
Check SSH key permissions in machine.ssh_info
2014-10-23 09:14:31 -07:00
Mitchell Hashimoto
2a8f74f54a
providers/virtualbox: style
2014-10-23 09:12:41 -07:00
Mitchell Hashimoto
7287604450
Merge pull request #4671 from jramnani/fix/master/nfs_exports_file_for_freebsd_guests
...
Fix #4658 . Bad NFS exports file on OS X & BSD hosts.
2014-10-23 09:12:00 -07:00
Mitchell Hashimoto
252d12de96
Merge pull request #4675 from mwrock/smb_config
...
use smb configured credentials from vagrantfile if available
2014-10-23 09:09:31 -07:00
Mitchell Hashimoto
44310872f6
Merge pull request #4693 from uchagani/master
...
guest/windows: Rename Windows guest without reboot
2014-10-23 09:06:55 -07:00
Mitchell Hashimoto
15f16181f5
communicators/ssh: clear out some comments
2014-10-23 09:06:28 -07:00
Mitchell Hashimoto
890dc21791
Merge pull request #4696 from konstantint/patch-1
...
core: raise errors if bad key perms/owner [GH-2163]
2014-10-23 09:05:36 -07:00
uchagani
2d465ea923
Fixed escape character problem in registry path
2014-10-23 11:27:14 -04:00
Konstantin Tretyakov
c332287665
Addresses issue #2163
...
In the situation where the SSH key has invalid permissions/owner, the reconnect-loop keeps failing repeatedly yet stays silent about the reasons. A message must be reported from the default exception handler (added). In addition, the situations where the SSH key owner or permissions are wrong must lead to a proper failure (added). Ideally, though, the owner/permissions check must happen before launching the VM, hence this is not a perfect fix.
2014-10-23 15:11:10 +03:00
Mikhail Zholobov
5197945e56
providers/virtualbox: Remove unused method "using_nfs?"
...
Related to [GH-4344]
2014-10-23 11:04:21 +04:00
uchagani
90cbdd85e1
Rename Windows guest without reboot
2014-10-23 02:27:05 -04:00
Mitchell Hashimoto
d28a7806ea
Merge pull request #4472 from abele/fix/master/salt-retcode-passthrough
...
Fix state.highstate run when using salt master
2014-10-22 22:03:46 -07:00
Mitchell Hashimoto
1e6259dd00
providers/docker: set preparing set to avoid data dir clear [GH-3873]
2014-10-22 20:52:08 -07:00
Mitchell Hashimoto
59ebef7b4b
command/rsync-auto: proxy VMs work [GH-4067]
2014-10-22 16:25:59 -07:00
Mitchell Hashimoto
0e29dd5668
commands/rsync: handle proxy machines [GH-4066]
2014-10-22 16:17:39 -07:00
Mitchell Hashimoto
296d0639cc
providers/docker: support auth [GH-4042]
2014-10-22 13:12:31 -07:00
Mitchell Hashimoto
cff57c8d01
core: trigger machine_id_changed for reload [GH-3963]
2014-10-22 12:07:49 -07:00
Mitchell Hashimoto
1ee46d3c95
providers/docker: check proper state for docker-logs [GH-3990]
2014-10-22 11:20:00 -07:00
Mitchell Hashimoto
9c23e4d9cb
providers/docker: expand vagrant_vagrantfile [GH-4000]
2014-10-22 11:02:26 -07:00
Mitchell Hashimoto
59fe62ec11
providers/docker: public_address reports host machine addr [GH-4342]
2014-10-22 10:37:32 -07:00
Mitchell Hashimoto
7988f0fb7c
Fix broken unit tests
2014-10-22 09:44:48 -07:00
Mitchell Hashimoto
57a1269e35
providers/docker: read the container ID properly
2014-10-22 09:33:57 -07:00
Mitchell Hashimoto
7ccec33460
providers/virtualbox: define a sync_folders action to setup NFS
...
[GH-4344]
2014-10-22 09:26:38 -07:00
Mitchell Hashimoto
9d4ab18f42
providers/docker: stop_timeout [GH-4504]
2014-10-21 17:50:45 -07:00
Mitchell Hashimoto
e749eaa039
providers/docker: more robustly detect built image [GH-4598]
2014-10-21 17:44:48 -07:00
Mitchell Hashimoto
fb1a825c0d
providers/docker: host IP and protocol is respected [GH-4505]
2014-10-21 17:17:34 -07:00
Mitchell Hashimoto
5228437b30
providers/docker: nicer error if package is called [GH-4595]
2014-10-21 17:04:46 -07:00
Mitchell Hashimoto
5ebd10c19c
communicators/ssh: timeout on connection check
2014-10-21 17:00:05 -07:00
Mitchell Hashimoto
7f432422e1
providers/docker: properly copy create_args in config [GH-4526]
2014-10-21 16:39:26 -07:00
Mitchell Hashimoto
18c76f0a86
provisioners/docker: search for Docker in multiple paths [GH-4580]
2014-10-21 16:19:02 -07:00
Mitchell Hashimoto
58f7310444
providers/virtualbox: detect conflict in name [GH-4681]
2014-10-21 15:56:32 -07:00
Matt Wrock
461f6f1281
do not automatically add /vagrant synced folder if another folder is already assigned to current path
2014-10-20 23:13:13 -07:00
Matt Wrock
9671f00e3a
use smb username and password in synced_folders config if available instead of prompting
2014-10-20 22:05:56 -07:00
Jeff Ramnani
bd5fd7ab18
Fix #4658 . Bad NFS exports file on OS X & BSD hosts.
...
For FreeBSD guests, Virtualbox can sometimes report the private network
interface IP address as "0.0.0.0". This will cause an invalid NFS
exports file to be generated for FreeBSD and OS X hosts.
Fixed by not allowing Virtualbox to report a guest IP address of
"0.0.0.0".
2014-10-20 12:35:30 -05:00
Gilles Cornu
4e81be879c
Check SSH key permissions in machine.ssh_info
...
With this change, any caller of machine.ssh_info is assured that best
efforts will be done to fix possible wrong permissions on the private
key files.
Fix #4652
2014-10-20 17:33:06 +02:00
Mitchell Hashimoto
34ac5f474c
Merge pull request #4615 from styro/fix/master/issue-4614
...
provisoiners/salt: Check whether Salt bootstrap script exists before deleting it. GH-4614
2014-10-18 16:13:20 -07:00
Mitchell Hashimoto
4af0f9b9c6
whitespace
2014-10-18 16:13:01 -07:00
dch
97589636b1
Provide output on raising LinuxMountFailed
2014-10-14 18:25:13 +01:00
Jörn Schwarze
b2a37dae99
...missed to replace the device variable :-)
2014-10-10 22:49:45 +02:00
Jörn Schwarze
fe3a380823
First fix didn't work correctly.
...
Now, the ip address will be removed, if there (from dhcp) and re-configured with the given value.
2014-10-10 22:42:13 +02:00
Jörn Schwarze
5036326319
Adding condition for the ipadm command on static ip addresses.
...
This will enable restarting solaris 11 vagrant boxes with static ip addresses.
2014-10-10 20:09:42 +02:00
David Lundgren
8b40f2bb2d
Don't update the NFS exports file [GH-4148]
...
Wrapped the NFS export modification process with a check for when there
are not exports to be modified
2014-10-10 11:02:01 -05:00
crypt1d
ca1456ff82
initial changes for forwarding port modifications
2014-10-10 13:01:04 +02:00
Anton D
fdbf3366ce
Check whether Salt bootstrap script exists before attempting to delete it. GH-4614
2014-10-10 23:20:50 +13:00
Shawn Neal
220e4f23b2
Merge pull request #4209 from mwrock/smb_sync
...
adding smb sync folder implementation for windows guests addressing #3699
2014-10-07 08:19:26 -07:00