Mitchell Hashimoto
d5c1c28a2b
Merge pull request #5094 from wkolean/docker-vbox-symlink-fix
...
enable symlinks before adding shared folder
2015-01-05 09:49:56 -08:00
Mitchell Hashimoto
9ce626854d
Merge pull request #5102 from tomassrnka/master
...
Fix catching "Start-VM" exceptions on Hyper-V during starting up VM
2015-01-05 09:44:01 -08:00
Seth Vargo
1699c92eec
Symbolize and stringify keys in options hash
2015-01-05 10:48:39 -05:00
Mitchell Hashimoto
5903bfb3c6
commands/push: validate configuration
...
/cc @sethvargo - Some weirdness here but overall should work fine. I'm
not sure if there was a GH issue this should be attached to or close. To
explain:
We just use the first machine with the default provider. A
Vagrant::Environment guarantees there is at least one machine, so
`env.machine_names.first` will always work. And we can just use the
default provider because we don't really care. Finally, it can be any
old machine we pass in because we just want the "global" config to
validate and there is no way to say "don't validate machine-specific
configs", so we might as well just pick the first machine to validate.
2015-01-04 15:43:30 -08:00
Seth Vargo
f11ec8ff1a
Make parent directories when uploading to FTP
2015-01-04 18:06:51 -05:00
Seth Vargo
6a3d99a9a2
Output to the UI when uploading via FTP
2015-01-04 18:06:32 -05:00
Seth Vargo
50c1c0756e
Expand file paths relative to the root_path
2015-01-04 18:06:22 -05:00
Seth Vargo
fd3c1c6ebb
Add a logger when uploading to FTP
2015-01-04 18:06:05 -05:00
Seth Vargo
e330875303
Exclude certain directories by default
2015-01-04 18:05:46 -05:00
Seth Vargo
e7391359e8
Remove duplicate #parse_host method
2015-01-04 18:05:17 -05:00
Seth Vargo
944853ab47
Use 21 for the default port
2015-01-04 16:24:26 -05:00
Tomas Srnka
2620042c26
Fix catching "Start-VM" exceptions on Hyper-V during starting up VM
2015-01-04 00:05:50 +01:00
William Kolean
084d2c06de
enable symlinks before adding shared folder
2015-01-01 16:00:17 -05:00
Andrew Mains
9aa20d5d6b
Added ability to run salt orchestrations to salt provisioner
2014-12-31 10:31:35 -08:00
Evgeny Vereshchagin
43bb715c00
Enable provision with --provision-with flag
2014-12-30 06:10:52 +03:00
Seth Vargo
97d5a6ebfc
Log chef-zero instead of chef-solo
2014-12-28 12:52:54 -05:00
evverx
1cfc5acea3
Update Chef plugin description
2014-12-24 03:53:29 +03:00
Masahiro Ono
55a90445cd
Fix new-style Network Device Naming on CentOS7+VMwarefusion
2014-12-21 16:25:11 +09:00
Mikhail Zholobov
e828927cee
providers/virtualbox: Add 'post-comm' to the list of valid events
2014-12-21 01:09:55 +03:00
Seth Vargo
5efb30653e
Merge pull request #4898 from athak/patch-solaris-rsync
...
rsynced folders don't work with Solaris based OS
2014-12-18 10:30:13 -05:00
Torben Knerr
f2b494c2cc
don't forget to pass the `installer_download_path` from the config!
2014-12-17 00:48:34 +01:00
Torben Knerr
acc4e3806f
pass the `download_path` parameter to the `:chef_install` capability so it is available when `Omnibus.build_command(..)` is invoked
2014-12-16 23:40:22 +01:00
Torben Knerr
d7bd65b4e2
extend the omnibus command builder with an additional download_path parameter
2014-12-16 23:29:47 +01:00
Torben Knerr
9e7f705bad
extend the Chef provisioner base config object with an 'installer_download_path' property
2014-12-16 22:40:19 +01:00
Shawn Neal
2785fd14db
Merge pull request #4996 from mitchellh/4976-fix-guest-autodetection-with-windows-guests
...
4976 fix guest autodetection with windows guests
2014-12-16 11:47:05 -08:00
Seth Vargo
954289beb6
Use new Chef Omnibus URL
2014-12-16 12:16:08 -05:00
Shawn Neal
c4422d7c70
Fix guest autodetection when running windows guests so Vagrant doesn't think the guest is Ubuntu
2014-12-16 08:20:01 -08:00
Barry Kelly
185740163c
Don't reorder config in /etc/network/interfaces
2014-12-15 19:21:22 +00:00
Seth Vargo
bce0d1acc9
Pushes are strings
2014-12-15 01:29:58 -05:00
Mitchell Hashimoto
4efb401050
kernel/v2: push config keys on strategy
...
/cc @sethvargo - This adds more tests that fail if this change isn't in
place.
2014-12-14 22:24:14 -08:00
Seth Vargo
8c8a92c4be
Merge pull request #4896 from analyzere/salt-grains-config
...
Issue #4895 : Support grains config for salt
2014-12-14 23:48:02 -05:00
Seth Vargo
c0d4b39eea
Force opts to be options
...
cb6f3e5
introduced a change to the method airty of machine actions to remove the
`extra_env` attribute.
- Fixes #4960
2014-12-14 23:46:39 -05:00
Seth Vargo
214a79e057
Pushes are hashed by name, not strategy.
...
@mitchellh this is a partial revert of 84ae22e
. It took me a little bit
to figure out why this broke everything, but then I finally realized it.
84ae22e
changes the finalize! function to lookup pushes by strategy
type, but pushes are keyed by push strategy name. In other words, given:
config.push.define("foo", strategy: "bar")
the `push_configs` has will look like:
{ :foo => [:bar, #<PushConfig>] }
This is important, because if we key by strategy, the user cannot
specify the same push strategy more than once:
config.push.define("foo", strategy: "bar")
config.push.define("zip", strategy: "bar")
If we keyed off of the strategy, this would be impossible.
2014-12-14 23:32:32 -05:00
Douézan-Grard Guillaume
9d1834a3c9
Fix line breaks
2014-12-13 21:08:31 +01:00
Mitchell Hashimoto
fdd7bc3ffd
commands/login: append access token to vagrantcloud => atlas URLs
2014-12-12 14:53:05 -08:00
Mitchell Hashimoto
84ae22e976
kernel/v2: fix push strategy config lookup
2014-12-12 01:36:39 -08:00
Mitchell Hashimoto
669c9fc013
commands/push: push strategy should be string
2014-12-12 01:27:22 -08:00
Mitchell Hashimoto
e212b31394
Merge pull request #4905 from mitchellh/gc-fix-docker-agent-forwarding
...
providers/docker: fix support of agent forwarding
2014-12-11 17:21:59 -08:00
Mitchell Hashimoto
a3a41fe3bc
Merge pull request #4906 from mitchellh/gc-4071-docker-ansible
...
provisioners/ansible: use Docker proxy when needed
2014-12-11 17:20:41 -08:00
Seth Vargo
6596f7f29d
Merge pull request #4937 from mitchellh/sethvargo/error_format
...
Use the new Rails error format
2014-12-11 16:54:45 -08:00
Max Lincoln
3e8fdc0ca4
WinRM SSL support
2014-12-11 15:07:34 -05:00
Max Lincoln
0b30dcd078
Merge branch 'winrmssl' into winrm_error_handling
...
Conflicts:
test/unit/plugins/communicators/winrm/shell_test.rb
2014-12-11 14:11:06 -05:00
Max Lincoln
234adaae63
WinRM SSL support
2014-12-11 14:09:17 -05:00
Max Lincoln
b5a9477405
Fix default forwarded ports
2014-12-11 13:39:24 -05:00
Max Lincoln
e7e50d39d9
Fix tests - all pass but auth retry test is extremely slow
2014-12-11 13:23:40 -05:00
Max Lincoln
24de8a1fb7
Just use ready?
2014-12-11 13:22:39 -05:00
Max Lincoln
ba7b964b1e
Better error handling for WinRM (using winrm v1.3.0.dev.2)
2014-12-11 13:22:39 -05:00
Max Lincoln
24f919c4d3
Fix accessors used by in communicator.rb
2014-12-11 13:22:39 -05:00
Max Lincoln
62ddd92768
Only forward one port for winrm
2014-12-11 13:22:39 -05:00
Max Lincoln
2caaf82ae0
Change default transport back to :plaintext, for backwards compatibility
2014-12-11 13:21:58 -05:00
Max Lincoln
02f4adc895
Fix broken variable references
2014-12-11 13:21:58 -05:00
Max Lincoln
072bb26a30
Change @ssl to @transport
2014-12-11 13:21:58 -05:00
Max Lincoln
b3480049ad
DRY the Shell: Don't duplicate the Config, especially since there were differing default values
2014-12-11 13:21:58 -05:00
Max Lincoln
1beb221bf3
Rename no_ssl_peer_verification to ssl_peer_verification, and make it configurable
2014-12-11 13:21:58 -05:00
Peter Ericson
243cc5dc37
config.rb: set default port based on @ssl
2014-12-11 13:20:22 -05:00
Peter Ericson
52d8fddf38
shell.rb: fix precedence
2014-12-11 13:20:22 -05:00
Peter Ericson
2f52a9c15c
Add winrmssl port forward (port 5986)
2014-12-11 13:20:22 -05:00
Peter Ericson
4455d2401b
Add ssl option to winrm config.rb
2014-12-11 13:19:09 -05:00
Peter Ericson
a99d32f60a
Add WinRM over SSL support
2014-12-11 13:19:09 -05:00
Seth Vargo
9a575a79ec
Use the new Rails error format
2014-12-11 01:21:46 -08:00
Seth Vargo
0506e17778
Update Atlas Push to use new vagrant-login API
2014-12-10 15:11:04 -08:00
Seth Vargo
7d6a6cd263
Read the ATLAS_TOKEN in vagrant-login
2014-12-10 15:08:43 -08:00
Mitchell Hashimoto
ed688ec775
Merge pull request #4929 from kalifg/master
...
Add back creation of mount point
2014-12-10 09:18:42 -08:00
Mitchell Hashimoto
2a285d7655
hosts/bad: escape regexp properly [GH-4922]
2014-12-10 09:16:45 -08:00
Michael Dwyer
e65ae7b543
Add back creation of mount point
...
Accidentally removed in ad4b30dd
2014-12-10 10:56:30 -06:00
Mitchell Hashimoto
02a615a646
Merge remote-tracking branch 'upcoming/master'
2014-12-09 16:18:18 -08:00
Seth Vargo
bb7b954a5f
Use the new namespace in Atlas config
2014-12-08 22:06:41 -08:00
Seth Vargo
62065e013a
Read and return login errors from Atlas
2014-12-08 18:26:36 -08:00
Seth Vargo
3d8a1ec3fc
Fix some rename shit
2014-12-08 18:26:36 -08:00
Seth Vargo
b973186cb5
Add vagrant-login to core ;)
2014-12-08 18:26:36 -08:00
Seth Vargo
2e4f854725
Vagrant Cloud -> Atlas
2014-12-08 17:42:29 -08:00
Seth Vargo
fa7cd37e42
Send the Atlas token
2014-12-08 16:54:19 -08:00
Gilles Cornu
118e223c33
provisioners/ansible: use Docker proxy when needed
...
Close #4071
Credits and best thanks to @jabclab
2014-12-08 21:43:21 +01:00
Gilles Cornu
15679f76f8
Merge pull request #4883 from mitchellh/gc-vagrant-1.7-ansible-provisioner
...
Non-trivial changes and bug fixes for the Ansible provisioner
2014-12-08 21:29:24 +01:00
Seth Vargo
9e5b587e66
Re-add TODO
2014-12-08 11:35:15 -08:00
Seth Vargo
70b61047c7
Do not support multiple strategies right now
2014-12-08 11:35:15 -08:00
Seth Vargo
6b48199346
Infer push name when only one strategy is defined, support multiple strategies
2014-12-08 11:35:15 -08:00
Mitchell Hashimoto
4a64da5663
Fix some issues around push, fix tests, add missing translations
2014-12-08 11:35:15 -08:00
Mitchell Hashimoto
44e6ec6df8
pushes/atlas: support custom server address
2014-12-08 11:35:15 -08:00
Mitchell Hashimoto
998c5688e8
pushes/atlas: Look for the uploader bin in the embedded dir
2014-12-08 11:35:15 -08:00
Seth Vargo
ede14d7daa
Separate local-exec push `script` from `inline`
2014-12-08 11:35:14 -08:00
Seth Vargo
612eeb2265
Add local-exec push
2014-12-08 11:35:14 -08:00
Seth Vargo
9d1a43c766
Interpret the app from the CWD
2014-12-08 11:35:14 -08:00
Seth Vargo
7e3de3951e
Do not check for a branch until after we have found git
2014-12-08 11:35:14 -08:00
Seth Vargo
b9e8f6e892
Interpret the current branch to push to Heroku
2014-12-08 11:35:14 -08:00
Seth Vargo
1f49b7ef62
Remove branch option (it should be interpreted)
2014-12-08 11:35:14 -08:00
Seth Vargo
ce380a3b12
Remove safe_exec (not being used)
2014-12-08 11:35:13 -08:00
Seth Vargo
4282fcf55e
Add heroku push plugin file
2014-12-08 11:35:13 -08:00
Seth Vargo
c16dc5c9c9
Add heroku push implementation
2014-12-08 11:35:13 -08:00
Seth Vargo
d4058130e4
Add heroku config
2014-12-08 11:35:13 -08:00
Seth Vargo
fb05563762
Load the translations in Atlas
2014-12-08 11:35:13 -08:00
Seth Vargo
1d7f4f26be
Provide a better error message for the FTP push
2014-12-08 11:35:13 -08:00
Seth Vargo
dc8b36b31d
Allow = methods for include and exclude
2014-12-08 11:35:13 -08:00
Seth Vargo
ed605c9aac
Rename Harmony to Atlas, minor config changes
2014-12-08 11:35:13 -08:00
Seth Vargo
c8bdf53c7e
Rename push environment to env
2014-12-08 11:35:12 -08:00
Seth Vargo
8aaf5dc578
Add the FTP push
2014-12-08 11:35:12 -08:00
Seth Vargo
80851a887f
Create an Adapter to bridge the APIs between SFTP and FTP libraries
2014-12-08 11:35:12 -08:00
Seth Vargo
eb5cecc782
Create ftp push plugin with custom i18n loading
2014-12-08 11:35:12 -08:00
Seth Vargo
b90253ea8c
Create ftp push config
2014-12-08 11:35:12 -08:00
Mitchell Hashimoto
913dafd3aa
pushes/harmony: remove unneceessary if
2014-12-08 11:35:12 -08:00
Mitchell Hashimoto
81f748347e
pushes/harmony: fixes from @sethvargo
2014-12-08 11:35:12 -08:00
Mitchell Hashimoto
fefaa8da71
pushes/harmony: use to_s.strip.empty? to check if app is set
2014-12-08 11:35:12 -08:00
Mitchell Hashimoto
1705460880
pushes/harmony: expand dir relative to Vagrantfile root path
2014-12-08 11:35:12 -08:00
Mitchell Hashimoto
f3f4f4aeb6
pushes/harmony: stub I18n
2014-12-08 11:35:12 -08:00
Mitchell Hashimoto
efffc5f2f7
push/harmony: basic push implementation
2014-12-08 11:35:11 -08:00
Mitchell Hashimoto
168715ad7d
push/harmony: ability to set uploader path
2014-12-08 11:35:11 -08:00
Mitchell Hashimoto
e7b0661a93
pushes/harmony: boilerplate, config
2014-12-08 11:35:11 -08:00
Seth Vargo
9af7675bd3
Use a more readable version for setter
2014-12-08 11:35:11 -08:00
Seth Vargo
1121e96cf7
Remove TODO comment about duplicate code
2014-12-08 11:35:11 -08:00
Seth Vargo
411c7d6f75
Define finalize! and __compiled_pushes for Push config
2014-12-08 11:35:11 -08:00
Seth Vargo
190da26404
Push does not have access to @machine
2014-12-08 11:35:10 -08:00
Seth Vargo
03b8105571
Super primitive implementation of Environment#push
2014-12-08 11:35:10 -08:00
Seth Vargo
b6c5ca6b7a
Add Push command and tests
2014-12-08 11:35:10 -08:00
Seth Vargo
0e824cc471
Rename file push to noop push
2014-12-08 11:35:09 -08:00
Seth Vargo
8a7e546972
Add preliminary File pusher (incomplete)
2014-12-08 11:35:09 -08:00
Atha Kouroussis
9e9362d976
Fix broken rsync cap for Solaris guests
2014-12-08 09:42:13 -05:00
Gilles Cornu
3800103228
provisioners/ansible: improve comment wording
...
Get rid of the Joker, thanks to @maspwr :)
2014-12-07 22:34:19 +01:00
Gilles Cornu
40a22ff99a
providers/docker: fix support of agent forwarding
2014-12-07 11:02:50 +01:00
Jeff Quast
c6cce57ff4
Avoid double-newlines in salt-call output
...
When using the salt provisioner with verbose=true, most lines read with an extra newline:
```
[INFO ] Syncing modules for environment 'base'
[INFO ] Loading cache from salt://_modules, for base)
```
because the line read has a newline, and emitting the log entry again includes an additional newline.
2014-12-03 21:48:30 -08:00
Chad Maloney
a2778c0a6b
Merge branch 'master' into GH4201-ShowRSyncOutput
2014-12-03 13:11:56 -06:00
Ken Crowell
72afdce630
Issue #4895 : Support grains config for salt
2014-12-02 18:01:09 -04:00
Paul Hinze
25ff636ee2
providers/virtualbox: cleanup default vbox dhcp server
...
fixes #3083
Detect the presence of the default DHCP server that comes in a fresh
VirtualBox install and clean it up to prevent it from colliding with
Vagrant-managed network config.
In order to accomplish this, we:
- add a `remove_dhcp_server` call to the virtualbox driver
- fix dhcp options parsing to allow `:dhcp_{ip,lower,upper}`
configuration options to make it through (so a user can override the
removal behavior with some explicit configuration)
- add the full `:network_name` to the details returned from
`:read_dhcp_servers`, so we can have a durable value to pass to
`:remove_dhcp_server`
Note that we do have to eat one more `VBoxManage list dhcpservers` for
each network interface to support this, but this seemed like a nominal
cost
2014-11-30 22:03:52 -06:00
Paul Hinze
24b6f21d1d
providers/virtualbox: extract reading dhcpservers from hostonlyifs
...
This is just a refactor, no behavior change.
Instead of stitching together dhcpserver info in the structure returned
from `read_host_only_interfaces`, sprout a new driver method called
`read_dhcp_servers` to return that information separately.
This means that driver clients (well there's really only _one_ client in
`ProviderVirtualBox::Action::Network`) have to do a bit more work to get
interface and DHCP server information.
But this gives us (a) a cleaner and more consistent driver interface and
(b) groundwork for a fix for #3083 , which will require interacting with
DHCP servers outside of the context of host-only interfaces.
2014-11-30 22:03:52 -06:00
Gilles Cornu
f96636587a
provisioners/ansible: don't read/write known_hosts
...
Like Vagrant's default SSH behaviors (e.g ssh or ssh-config commands),
the Ansible provisioner should by default not modify or read the user
known host file (e.g. ~/.ssh/known_hosts).
Given that `UserKnownHostsFile=/dev/null` SSH option is usually combined
with `StrictHostKeyChecking=no`, it seems quite reasonable to bind the
activation/disactivation of both options to `host_key_checking`
provisioner attribute.
For the records, a discussion held in Ansible-Development mailing list
clearly confirmed that there is no short-term plan to adapt Ansible to
offer an extra option or change the behavior of
ANSIBLE_HOST_KEY_CHECKING. For this reason, the current implementation
seems reasonable and should be stable on the long run.
Close #3900
Related References:
- https://groups.google.com/forum/#!msg/ansible-devel/iuoZs1oImNs/6xrj5oa1CmoJ
- https://github.com/ansible/ansible/issues/9442
2014-11-30 09:55:48 +01:00
Gilles Cornu
178942cf27
provisioners/ansible: change arguments arrangement
...
- force `--connection=ssh` (any other modes like paramiko or smart are not
supported)
- give the highest priority to `raw_arguments` for sake of simplicity (in
usage, in code and in documentation)
- fix position of the `--limit` argument (the generated inventory could be
shadowed by `raw_arguments`, while ansible.limit was able to override
`raw_arguments`
ref #3396
2014-11-30 09:50:50 +01:00
Gilles Cornu
306c4f7eda
provisioners/ansible: force --connection=ssh
...
When `--connection` argument is not specified, Ansible will use the
'smart' mode, which can either use `ssh` or `paramiko` transports,
depending of the version of OpenSSH available. If OpenSSH version is new
enough to support ControlPersist technology, `ssh` will be used.
See also http://docs.ansible.com/intro_configuration.html#transport .
In order to support some advanced features of Vagrant (e.g. multiple ssh
private key identities or ssh forwarding), the Ansible provisioner
already must force `ssh` connection mode.
Having to deal with the possible fallback to `paramiko` increase the
burden of special cases that Ansible provisioner must handle, without
any added value, as Vagrant is based on OpenSSH and its users are
usually using modern operating systems.
With this change, the Ansible provisioner will officially only support
`ssh`. It will still be possible to switch to another connection mode
via `raw_arguments`, but it will breach the "contract", and no
(community) support can be expected in such use case.
ref #3900 , #3396
2014-11-30 09:50:50 +01:00
Chad Maloney
1ed31afeba
GH-4201: Cleaned up some leftover junk I missed removing
2014-11-25 14:39:56 -06:00
Chad Maloney
cf784d5d3c
GH-4201: Split process output by line so prefix shows on each line. Also fixed localization reference.
2014-11-25 14:37:59 -06:00
Chad Maloney
5de3f30bb0
GH-4201: Added rsync__showoutput to display rsync output to console
2014-11-25 12:38:41 -06:00
Gilles Cornu
1c884fa4e5
provisioners/ansible: Show Ansible command when VAGRANT_LOG=debug
2014-11-25 08:12:43 +01:00
Daniel Klockenkämper
8066c38881
Update configure_networks.rb for funtoo
...
fixed name of temporary network configuration file to work with the further process of copying file to configuration directory
2014-11-11 15:12:48 +01:00
Seth Vargo
f86189a2fe
Add Env.with_clean_env for resetting the Ruby and Rubygems environment
2014-11-10 12:00:23 -05:00
Seth Vargo
f232dc38c9
Automatically install Chef when provisioning with Chef
2014-11-07 15:56:22 -05:00
Seth Vargo
a8fa4bccc7
Add Chef::Config#install and Chef::Config#version options
2014-11-07 15:56:21 -05:00
Seth Vargo
8f35ecaa6f
Extract runner-specific Chef configs into their own subclass
...
This separates the truly basic pieces of Chef (like install url and
log_level) from the runner pieces of Chef (like provisioning_path). This
is necessary because the Chef Apply provisioner does not actually need
most of the Chef configuration options.
2014-11-07 15:56:21 -05:00
Chris Jones
b19abebdf0
Grammar fix to the network interface bridge question
2014-10-31 15:16:02 -04:00
Seth Vargo
59eb0ad2e8
Add Chef Apply provisioner
2014-10-30 15:32:15 -04:00
Seth Vargo
514101816b
Fix alignment in the Chef Client config
2014-10-30 15:32:10 -04:00
Seth Vargo
af9177550a
Properly handle empty/nil values in Chef Solo config
2014-10-30 13:43:26 -04:00
Seth Vargo
7e71d72db8
Check for empty chef_server_url and validation_key_path
2014-10-30 13:43:25 -04:00
Seth Vargo
721edf70b9
Make Chef Zero lowercase in validation (conforms to other keys)
2014-10-30 13:43:25 -04:00
Seth Vargo
1169c80a72
Use require_relative for faster loading
...
require_relative is an order of magnitude faster on Windows
2014-10-30 13:43:25 -04:00
Teemu Matilainen
dec5dcdda3
provisioners/chef: Add `chef_zero` provisioner
...
Add Chef Zero provisioner using `local_mode` configuration for
chef-solo/chef-client.
2014-10-30 13:43:24 -04:00
Fabian Ruff
8990e18e6d
fix copy and paste bug
2014-10-27 18:23:00 +01:00
Fabian Ruff
d33c7b4d7a
Add password to rdp_info hash
...
Any specific reason the password was omitted from the rdp_info hash?
Without the password in the rdp_info hash I see no way of figuring out the password in the rdp_client capability.
2014-10-27 18:21:02 +01:00
Adam Spiers
6af715b0db
silence warnings about unescaped '-' in re char class
...
Eliminate warnings like this:
vagrant/plugins/hosts/linux/cap/nfs.rb:74: warning: character class has '-' without escape: /^# VAGRANT-BEGIN:( 1000)? ([\.\/A-Za-z0-9-_]+?)$/
2014-10-25 15:38:13 +01:00
Tarrant
eeb11ec653
Merge branch 'master' of github.com:tarrant/vagrant
2014-10-24 13:54:16 -07:00
Tarrant
70fece7a99
Add support for DHCP on tinycore
2014-10-24 13:52:35 -07:00
Tarrant
ba994baa65
Revert "guests/tinycore: error if DHCP [GH-4699]"
...
This reverts commit 64139f2158
.
2014-10-24 13:52:06 -07:00
Mitchell Hashimoto
ea983e32c8
hosts/*: NFS prune regexp matches file paths [GH-3815]
2014-10-24 12:16:53 -07:00
Mitchell Hashimoto
64139f2158
guests/tinycore: error if DHCP [GH-4699]
2014-10-24 11:24:16 -07:00
Mitchell Hashimoto
5418e6b85e
guests: add remove_public_key to most guests
2014-10-24 10:05:01 -07:00
Mitchell Hashimoto
94b2a8a56b
communicators/ssh: insert random key, remove insecure key
2014-10-24 09:58:18 -07:00
Mitchell Hashimoto
37a4000722
providers/virtualbox: more descriptive error if empty version [GH-4657]
2014-10-24 09:20:08 -07:00
Mitchell Hashimoto
da91741b7c
provisioners/shell: fix typo
2014-10-23 22:49:26 -07:00
Mitchell Hashimoto
a7d3458abc
provisioners/shell: retry getting SSH info a few times [GH-3924]
2014-10-23 22:48:48 -07:00
Mitchell Hashimoto
cc01f01684
hosts/linux: don't use sudo to write NFS if writable [GH-2643]
2014-10-23 22:25:38 -07:00
Mitchell Hashimoto
6ea8dc8e20
core: cleaner output of what provisioner is running if named
2014-10-23 18:47:03 -07:00
Mitchell Hashimoto
97f9948fce
core: provisioners are defined differently now
2014-10-23 18:40:14 -07:00
Mitchell Hashimoto
aa981cf4ec
hosts/bsd: only use sudo if we can't write /etc/exports [GH-2643]
2014-10-23 17:43:58 -07:00
Mitchell Hashimoto
ad758bf69a
core: prefer providers in the Vagrantfile [GH-3812]
2014-10-23 15:32:54 -07:00
Mitchell Hashimoto
b656bf4ae5
providers/docker: build output [GH-3739]
2014-10-23 15:03:09 -07:00
Gilles Cornu
1e324093a5
provisioners/ansible: spare machine.ssh_info calls
...
As a result of #4670 and the safe decision to not memoize
machine.ssh_info (see 89a4a29d65
and
5036d16461
), it is preferable to store the
ssh_info hashes and avoid multiple function calls when generating the
ansible inventory.
2014-10-23 22:58:01 +02:00
Mitchell Hashimoto
f23c5ebc46
commands/plugin: list puts plugin namein machine readable output
...
[GH-4506]
2014-10-23 12:00:46 -07:00
Mitchell Hashimoto
06defb37c7
commands/up: if all machines autostart:false, start none [GH-4552]
2014-10-23 11:46:22 -07:00
Mitchell Hashimoto
37a04b4bfc
provisioners/puppet: use correct error class [GH-4520]
2014-10-23 10:46:11 -07:00
Mitchell Hashimoto
4ffaaf119e
providers/virtualbox: more hints when choosing interface [GH-4463]
2014-10-23 10:24:07 -07:00
Mitchell Hashimoto
9b9c24cb59
Merge pull request #4468 from SilverWyrda/arch-predictable-network-interface-names
...
guests/arch: Add support for predictable network interfaces names
2014-10-23 10:20:01 -07:00
Mitchell Hashimoto
26c468b5f9
Merge pull request #4469 from Gurpartap/tinycore-change_host_name-pr
...
change_host_name.rb for TinyCore Linux
2014-10-23 10:18:56 -07:00
Mitchell Hashimoto
d04ec704c1
update CHANGELOG
2014-10-23 10:12:27 -07:00
Mitchell Hashimoto
4b4255c6d1
Merge pull request #4492 from tboerger/feature/suse-fixes
...
SUSE naming and capability fixes
2014-10-23 10:11:28 -07:00
Mitchell Hashimoto
e30ba41104
Merge pull request #4499 from sprin/centos_7_nfs_client
...
Fix NFSClient plugin for Redhat / Centos 7 guests
2014-10-23 10:09:11 -07:00
Mitchell Hashimoto
4c0aa0d9cb
update CHANGELOG
2014-10-23 10:04:58 -07:00
Mitchell Hashimoto
fca6428ecd
Merge pull request #4518 from lunetics/master
...
guests/freebsd: allow NFS version param
2014-10-23 10:03:41 -07:00
Mitchell Hashimoto
f24af5dda4
Merge pull request #4527 from Asquera/bugfix/4465-host-not-added-to-etc-hosts
...
Fix #4465 update /etc/hosts on rhel 7 and derivatives (CentOS)
2014-10-23 09:57:12 -07:00
Mitchell Hashimoto
d211e1c1d2
Merge pull request #4534 from matgnt/master
...
hosts/windows: Don't mount all drives into the RDP session
2014-10-23 09:56:11 -07:00
Mitchell Hashimoto
50b0ea8173
Merge pull request #4535 from plu/master
...
guests/darwin: Set ComputerName and LocalHostName on darwin guests
2014-10-23 09:55:13 -07:00
Mitchell Hashimoto
3f01a99148
provisioners/shell: rename shell_args to powershell-args
2014-10-23 09:53:14 -07:00
Mitchell Hashimoto
f0a4e26d27
Merge pull request #4548 from ebelew/shellargs
...
Update powershell provisioning to fix #4547
2014-10-23 09:50:50 -07:00
Mitchell Hashimoto
35c9b59968
Merge pull request #4565 from dup2/patch-1
...
guests/ubuntu: A more reliable way to detect Ubuntu via lsb_release
2014-10-23 09:46:54 -07:00
Mitchell Hashimoto
f122ed756c
Merge pull request #4571 from jperville/docker-provider-allow-multiple-links-to-same-backend
...
providers/docker: allow multiple links to same backend (different aliases)
2014-10-23 09:45:14 -07:00
Mitchell Hashimoto
abb9e5478a
provisioners/docker: get GPG key via SSL [GH-4597]
2014-10-23 09:34:24 -07:00
Mitchell Hashimoto
29df3c733b
Merge pull request #4596 from miguel250/patch-1
...
Use HTTPS to download docker's gpg key.
2014-10-23 09:32:54 -07:00
Mitchell Hashimoto
a6c0989bc6
Revert "Merge pull request #4616 from crypt1d/master"
...
This reverts commit aec69c4627
, reversing
changes made to 88754d2904
.
2014-10-23 09:30:46 -07:00
Mitchell Hashimoto
aec69c4627
Merge pull request #4616 from crypt1d/master
...
Consider the host_ip value when handling port collisions
2014-10-23 09:26:31 -07:00
Mitchell Hashimoto
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
Miguel Perez
307c670154
Use SSL to download docker gpg key.
...
Fixed #4569
2014-10-21 17:29:49 -04: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
Ben Hines
3321a6da11
Make environment path param more canonical with an underscore
2014-10-19 21:34:54 -07:00
Ben Hines
16870d72d1
Some work in progress environment support
2014-10-19 21:28:38 -07: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
Thomas Boerger
95f39d52fa
Added better check if nfs server is available on SUSE hosts
2014-10-06 16:32:00 +02:00
Julien Pervillé
97341c3234
providers/docker: allow multiple links to same backend (different aliases).
2014-09-29 18:46:01 +02:00
Dr. Zarkov
779e54eef5
A more reliable way to detect Ubuntu
...
The default /etc/issue might have been changed by the administrator and not contain the string 'Ubuntu' anymore.
2014-09-26 14:05:54 +02:00
Eris Belew
7a73f5bd7c
Update shell provisioner for powershell to add "shell_args", saner defaults and more useful detail in logging output; Add Eclipse .project file to .gitignore IDE section
2014-09-23 12:46:25 -07:00
Johannes Plunien
286e9cd01e
Set ComputerName and LocalHostName on darwin guests
...
This sets the bonjour host name for darwin guests to the same value
as config.vm.hostname. It also sets the user-friendly name for the
system.
2014-09-21 19:14:59 +02:00
Matthias Günther
9b937db6c9
hosts/windows: Don't mount all drives into the RDP session
...
This setting mounts all available drives (C:\ and mapped network
drives) into the RDP session. This shouldn't be the default.
2014-09-21 15:11:00 +02:00
Felix Gilcher
96b011b39e
update /etc/hosts on rhel 7
...
the previous fix for #4465 assumed that the NetworkManager takes care of updating /etc/hosts with
the new hostname, but testing shows it doesn't. This change ensures that the change is always added
to /etc/hosts when the name changes.
2014-09-20 17:34:01 +02:00
Matthias Breddin
d4b30dd12a
Allow nfs
2014-09-18 17:14:13 +02:00
Ben Hines
1a6805d469
Use the more canonical require_relative to include files
2014-09-15 21:49:37 -07:00
sprin
a712f70634
Fix NFSClient plugin for Redhat / Centos 7 guests
...
Fixes #4476 .
2014-09-12 15:35:10 -07:00
Thomas Boerger
2d4454dcb4
Added a nonsudo command for nfsd check
2014-09-11 17:44:28 +02:00
Thomas Boerger
063a903bdb
Fixed and extended suse guest capabilities
...
In order to get a SUSE guest running and installing fine i have added a
correct capability for installing rsync and nfs-client.
I have included SUSE naming fixes as well because SUSe doesnt get
spelled SuSE anymore :).
2014-09-11 17:07:49 +02:00
Thomas Boerger
6c20b6cd34
Fixed suse spelling in fedora capability
2014-09-11 10:52:15 +02:00
Thomas Boerger
31b6d69127
Fixed suse naming for fcengine cap and refined install command
2014-09-11 10:51:34 +02:00
Thomas Boerger
f1b62ae03a
Fixed class naming and detection for suse hosts
2014-09-11 10:48:58 +02:00
Thomas Boerger
6fa0fe09ab
Renamed host capabilities from opensuse to suse
2014-09-11 10:47:13 +02:00
Jānis Ābele
fe16352267
Fix state.highstate run when using salt master
...
retcode-passthrough option is available only for masterless salt-call.
2014-09-07 20:03:17 +03:00
Gurpartap Singh
fd25cbefe1
change_host_name cap for TinyCore Linux
2014-09-07 02:05:41 +05:30
SilverWyrda
384fd3ba98
Delegate cleaning to arch box packagers
2014-09-06 06:44:24 +02:00
SilverWyrda
10090bf4dc
Add support for predictable network interfaces names
2014-09-06 04:56:01 +02:00
Mitchell Hashimoto
951dc934cc
providers/virtualbox: cleaner ignore DHCP
2014-09-04 14:20:03 -07:00
Mitchell Hashimoto
8655d212c3
kernel/v2: always forward SSH [GH-4437]
2014-09-04 14:19:47 -07:00
Mitchell Hashimoto
5f3f52314b
Merge pull request #4434 from simoleone/fix-nfs-with-dhcp-custom-range
...
Fix NFS when DHCP settings use a custom IP range
2014-09-04 14:12:41 -07:00
Andy Thompson
e667bcb675
Fix failure to detect RHEL 7 flavours
2014-09-04 22:03:07 +01:00
Andy Thompson
5c988b64b5
Fixes #4450 , add another expand_path ../ to get back to the guests directory
2014-09-04 20:51:10 +01:00
Nicolas Philippe
1bb61fb3f9
Fix for issue #4452 : undefined stdout in communicator.rb
...
Fixes #4452 .
The stdout variable was changed during commit
https://github.com/mitchellh/vagrant/commit/138aa5aad375ac0c076a0e0a3493
e25906ce0434 . This commit just corrects this omission.
2014-09-03 20:47:46 -05:00
Andy Thompson
fb1d4adf87
Fixes #4438 typo missing sending networks param for rhel guest network
2014-09-03 16:09:30 +01:00
keithchambers
1f93582131
Fixed typo: hostnamectl vs. homenamectl
2014-09-02 21:55:33 -07:00
Simo Leone
71119590e8
Fix NFS when DHCP settings use a custom IP range
...
Only use the static IP if it is indeed a static IP. Otherwise assume
it's DHCP and get the IP that way.
2014-09-02 13:17:30 -07:00
James Shubin
4763506b89
Remove erroneous yum upgrade.
...
This upgrade shouldn't be part of the docker setup process. If an
upgrade is needed, it should be done independently of the docker setup.
Do it to your base image, or if needed, as a shell provisioner step.
2014-09-02 12:44:46 -04:00
Mitchell Hashimoto
38507e2fab
commands/version: remove unused require
2014-09-01 15:29:27 -07:00
Mitchell Hashimoto
140a1b8d4b
commands/version: use checkpoint data
2014-09-01 15:23:46 -07:00
Mitchell Hashimoto
3974633dc2
Merge pull request #4418 from gpoulin2/nfs_gentoo_systemd
...
fix nfs on gentoo with systemd
2014-08-31 10:51:12 -07:00
Mitchell Hashimoto
0d6cf9e25f
commands/rsync-auto: fix typo
2014-08-31 10:50:33 -07:00
Mitchell Hashimoto
41f4ec1e4d
guests/redhat: set hostname on EL7 [GH-4352]
2014-08-31 09:58:12 -07:00
Mitchell Hashimoto
a54f2dc539
command/rsync-auto: add --poll flag [GH-4392]
2014-08-31 09:54:37 -07:00
Guillaume Poulin
a2985832eb
fix nfs on gentoo with systemd
2014-08-31 22:29:16 +08:00
Mitchell Hashimoto
f4ee4764bb
guests/redhat: configure networks properly on EL7 [GH-4195]
2014-08-30 22:49:13 -07:00
Mitchell Hashimoto
ee70bdd028
provisioners/docker: fix ruby typo
2014-08-30 22:46:57 -07:00
Mitchell Hashimoto
6074a63683
guests/redhat: install Docker on EL7 properly [GH-4402]
2014-08-30 22:44:48 -07:00
Mitchell Hashimoto
9ff18fb1b7
providers/docker: unique name with docker-run
2014-08-30 22:29:46 -07:00
Ray Clanan
f1e730e9a1
Unset container name if docker_run is called. Fixes #4294
2014-08-29 23:29:58 -04:00
Eric Saxby
dd77295533
Ensure rsync_post has find permissions on smartos
2014-08-29 14:17:28 -07:00
Mitchell Hashimoto
4138179207
commands/plugin: error if windows with space in dir [GH-4351]
2014-08-29 12:16:40 -07:00
Mitchell Hashimoto
e5a7bfebbc
commands/box/update: proper provider is updated [GH-4374]
2014-08-29 12:05:44 -07:00
Mitchell Hashimoto
be6665864d
communicators/ssh: nicer errors for SSH exceptions [GH-4367]
2014-08-29 11:40:50 -07:00
Mitchell Hashimoto
059243670f
commands/box: update gives nice message if no box
2014-08-29 11:19:54 -07:00
Mitchell Hashimoto
b4345968a5
providers/docker: SSH extra args go to Docker container [GH-4378]
2014-08-29 11:11:53 -07:00
Mitchell Hashimoto
aae3d93afe
Merge pull request #4377 from sumkincpp/patch-1
...
provisioner/docker: Verbose output for docker provisioner
2014-08-29 10:29:17 -07:00
Mitchell Hashimoto
9e5a2d28c6
Merge pull request #4308 from Voxer/fix/master/issue4307
...
guest/freebsd: fix interface device names in /etc/rc.conf
2014-08-29 09:54:31 -07:00
Mitchell Hashimoto
c29f7dd981
Merge pull request #4335 from nmische/GH-4315
...
provisioners/cfengine: Changing default repo URL.
2014-08-29 09:53:24 -07:00
Mitchell Hashimoto
b842a3ed62
Merge pull request #4379 from s7726/master
...
Update Windows Salt provisioner version
2014-08-29 09:51:24 -07:00
Mitchell Hashimoto
069230a563
Merge pull request #4383 from mwrock/error
...
communicators/winrm: handle errors that do not set an exit code
2014-08-29 09:50:41 -07:00
Mitchell Hashimoto
b2b79a4ea8
guests/linux: backoff a bit on the mount timeout [GH-4403]
2014-08-29 09:47:34 -07:00
Mitchell Hashimoto
138aa5aad3
communicators/ssh: cleanup PTY code for GH-4408]
2014-08-29 09:41:35 -07:00
Mitchell Hashimoto
a9be7ce224
Merge pull request #4408 from lsimons/ssh-scrub-pty-output-for-upstream
...
core: Scrub SSH PTY output to filter out command echo-ing and most other cruft
2014-08-29 09:33:10 -07:00
Mitchell Hashimoto
77e04e2b77
commands/provision: don't advertise parallel [GH-4398]
2014-08-29 08:32:04 -07:00
Mitchell Hashimoto
b42e9aef23
guests/linux: more verbose output when shared folder mount fails
...
[GH-4403]
2014-08-29 08:27:48 -07:00
Leo Simons
87fb5d11fe
Preserve exit code while using pseudo-terminal hack.
2014-08-29 11:50:22 +02:00
Leo Simons
fec14cf04c
Use -f argument to rm to force-remove files.
...
When using pty=true, removing files using sudo may request confirmation,
which will hang the connection.
Similarly, sometimes assumptions about file existence may be wrong and
in those cases it seems better to continue on as long as the file does
not exist, so -f makes sense there, too.
2014-08-29 10:51:31 +02:00
Leo Simons
a0d3719b52
Scrub SSH PTY output to filter out command echo-ing.
2014-08-28 18:02:27 +02:00
Veres Lajos
4ef996dca9
typofixes - https://github.com/vlajos/misspell_fixer
2014-08-25 20:12:25 +01:00
Matt Wrock
e22767184b
exit wit code 1 from powershell commands that fail but do not send an exit code
2014-08-24 10:18:03 -07:00
Gavin Swanson
59826264b8
Update Windows Salt provisioner version
2014-08-23 15:36:52 -07:00
Fedor Sumkin
f2c7dc05a1
Verbose output for docker provisioner
...
Verbose output for docker build and pull tasks
2014-08-22 19:41:01 +04:00
Stefan Scherer
f0ef46f648
write to stdout before exit 1
2014-08-17 16:22:35 +02:00
Nathan Mische
70d060cc85
Changing default repo URL.
2014-08-11 21:13:12 -04:00
Mitchell Hashimoto
a53156e426
core: don't allow '/' in VM name [GH-4289]
2014-08-11 09:21:31 -07:00
Matt Wrock
d820bef6f4
filter host IPs to those that resolve on guest when finding addresable IPs on a windows guest
2014-08-11 00:07:21 -07:00
Matt Wrock
e64f84491e
adding smb sync folder implementation for windows guests addressing #3699
2014-08-11 00:07:21 -07:00
Mitchell Hashimoto
b675be383b
core: disallow brackets in VM names [GH-4319]
2014-08-10 21:05:29 -07:00
Mitchell Hashimoto
7068f4e37b
Merge pull request #4324 from mwrock/generation
...
providers/hyper-v: fixes import for hyper-v generation 2 VMs
2014-08-10 20:42:30 -07:00
Paris Holley
802d17a248
remove vm by default when using docker run
2014-08-09 12:03:35 -07:00
Matt Wrock
be75702f35
fixes import for hyper-v generation 2 VMs
2014-08-09 10:30:10 -07:00
Mitchell Hashimoto
6e4541110b
Merge pull request #4313 from w3ttr3y/master
...
Fixes 4309: Error when provisioning Windows host using Puppet
2014-08-08 18:24:53 -07:00
Mitchell Hashimoto
8bee751898
commands/reload: show post-up message [GH-4168]
2014-08-08 17:40:07 -07:00
Mitchell Hashimoto
2214591bef
providers/hyperv: fix double-dot in drive name [GH-4318]
2014-08-08 12:15:03 -07:00
Mitchell Hashimoto
ae1a03903e
providers/virtualbox: error if can't read VM name [GH-4047]
2014-08-08 10:49:07 -07:00
Mitchell Hashimoto
0da5d7b650
communicators/ssh: clean error on max session [GH-4044]
2014-08-08 09:11:25 -07:00
Mitchell Hashimoto
5ed0b22c78
communicators/ssh: cleaner error if remote disconnect [GH-4038]
2014-08-07 11:53:44 -07:00
William E. Triest. III
4a2566c646
Fixes 4309
...
When the winrm communicator executes a command in an elevated shell,
this patch causes it to escape double quotes.
This is necessary as the first line in the file that it produces and
then executes it puts the command into a variable called command that
is delimited by double quotes.
2014-08-07 08:49:36 -04:00
Mitchell Hashimoto
a08d9078da
commands/rsync-auto: check machine ID prior to sync [GH-4031]
2014-08-06 16:56:09 -07:00
Mitchell Hashimoto
1428ab0404
providers/docker: single port works [GH-3991]
2014-08-06 15:34:41 -07:00
Kostyantyn Fomin
c43ab95f86
Fix Issue 4307: FreeBSD fix interface device names in /etc/rc.conf
...
https://github.com/mitchellh/vagrant/issues/4307
Fix details:
Pass network interface name to template renderer and use it
in static and dhcp templates to render /etc/rc.conf entries.
modified: plugins/guests/freebsd/cap/configure_networks.rb
modified: templates/guests/freebsd/network_dhcp.erb
modified: templates/guests/freebsd/network_static.erb
Verification scenario:
Check if /etc/rc.conf contains vtnet entries when paravirtualized
NIC devices are used in FreeBSD guest.
2014-08-06 14:10:05 -07:00
Mitchell Hashimoto
00bd226fc7
guests/nixos: don't detect as Windows [GH-4302]
2014-08-06 11:17:41 -07:00
Mitchell Hashimoto
b516881d47
provisioners/puppet: don't repeat output when prov fails [GH-4303]
2014-08-06 11:11:12 -07:00
Mitchell Hashimoto
1cc78dc224
provisioners/salt: use exit code to detect failure [GH-4304]
2014-08-06 11:07:09 -07:00
Mitchell Hashimoto
3bc5ecfbd0
provisioners/salt: whitespace
2014-08-06 11:05:03 -07:00
Mitchell Hashimoto
3f456cdf45
Merge pull request #4088 from salimane/pr_nfs_rpcbind_centos
...
guests/centos: Restart rpcbind and nfs while installing nfs client on centos guests
2014-08-06 10:47:38 -07:00
Mitchell Hashimoto
94841ef1bc
Merge pull request #4094 from mitchellh/improved-winrm-command-failure-messaging
...
provisioners/winrm: Better WinRM command failure messaging
2014-08-06 10:44:35 -07:00
Mitchell Hashimoto
e82d425719
Merge pull request #4087 from zr40/fix/master/prevent-double-output
...
Don't output stdout and stderr twice when shell provisioner fails
2014-08-06 10:32:13 -07:00
Mitchell Hashimoto
0f3e4242df
Merge pull request #3934 from xstevecs/master
...
providers/virtualbox: Disable automatic enablement of hostiocache
2014-08-06 10:27:20 -07:00
Mitchell Hashimoto
7fb153a2ef
Merge pull request #3932 from marnovdm/feature/salt-modular-version
...
provisioners/salt: Updates Salt Minion version in Salt Bootstrap script for Windows
2014-08-06 10:25:58 -07:00
Mitchell Hashimoto
2cdcc29902
provisioners/chef: put global lock around knife exec
2014-08-06 10:24:05 -07:00
Mitchell Hashimoto
22395e5cb4
Merge pull request #4099 from mitchellh/fix-issue-2476-chef-client-node-cleanup
...
provisioners/chef: clean bundle env when executing chef client
2014-08-06 10:13:37 -07:00
Mitchell Hashimoto
e1ea304884
Merge pull request #4169 from schauer/patch-1
...
provisioners/puppet: manifest file can be a dir too
2014-08-06 09:56:24 -07:00
Mitchell Hashimoto
3b2e3b6a69
Merge pull request #4207 from stevemcc/enhancement/virtualbox_36_nic
...
Changed hardcoded number of interfaces, fixes #4206 .
2014-08-06 09:51:30 -07:00
Mitchell Hashimoto
79fd20c8c7
Merge pull request #4208 from mwrock/file-path
...
providers/hyperv: accept vhd as well as vhdx file types on hyper-v
2014-08-05 17:51:11 -07:00
Mitchell Hashimoto
864328e0b1
Merge pull request #4224 from kamazee/fix/master/nfs_archlinux_systemd
...
hosts/arch: Fix NFS server starting/stopping and status check
2014-08-05 17:46:40 -07:00
Mitchell Hashimoto
4600963dc9
Merge pull request #4228 from stvleung/fix-master-add-el7-nfs-support
...
hosts/redhat: use systemd for NFS on RH7+
2014-08-05 17:44:35 -07:00
Mitchell Hashimoto
f5854c5618
Merge pull request #4234 from b-dean/fixnum-array-args-fix
...
provisioner/shell: fix cannot handle Fixnum array args
2014-08-05 17:29:59 -07:00
Mitchell Hashimoto
7aff08f9a1
Merge pull request #4271 from Scythril/winrm_mkdir_rm_filter
...
communicator/winrm: Fixed some WinRM command filters
2014-08-05 17:22:24 -07:00
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
Richard Guin
120b15bc39
Modified WinRM rm filter to account for -f switch, handle recurse properly
2014-07-30 15:43:37 -04:00
Richard Guin
361d41527a
Added mkdir command filter for WinRM to be compatible with PS4+
2014-07-30 15:43:11 -04:00
Ben Dean
dbb92ae412
change the shell provision config to make all the args strings
...
specifically arrays could contain `Fixnum` args and those wouldn't get turned into strings.
2014-07-22 15:41:01 -04:00
Alexander Kurilo
d2b65a9efa
Fix NFS server running and status check
...
According to https://wiki.archlinux.org/index.php/NFS#Starting_the_server
2014-07-22 16:47:12 +03:00
Steven Leung
1fc36d2d3a
Redhat 7 to use systemd as well …
...
Change nfs plugin to detect distribution and version
Fixes issue #4227
2014-07-21 10:56:06 -07:00
Matt Wrock
efd7c619d1
accept vhd as well as vhdx file types on hyper-v
2014-07-17 02:50:51 -07:00
Steve McConville
de7ed34120
Changed hardcoded number of interfaces, fixes #4206 .
2014-07-17 09:52:57 +01:00