45e14a8dc4
UNC paths should have backslashes, not front-slashes.
2015-04-16 11:02:58 -04:00
415837c544
moved function to platform utils, added unit test as per @sethvargo
2015-04-06 16:51:55 -04:00
9d50f72df3
For SMB on Linux guests, specify the user's domain as a separate parameter to the mount command. This is more reliable than passing user@domain as the username. This is not needed for SMB on Windows guests as they expect the user@domain form.
...
This does not change how it is configured in the Vagrantfile.
Fixes #3620
2015-03-31 08:16:06 -07:00
8e6db0015f
Fixed typo
2015-03-30 11:01:38 -06:00
7628ca71e7
Removed default dependences to number
2015-03-30 10:57:11 -06:00
9e23d16d9c
merged vlan_id changes for hyperv by tomassrnka
2015-03-30 08:37:29 -06:00
e745436df3
provisioners/ansible: disable color if Vagrant has no color [GH-5531]
2015-03-28 19:05:54 -05:00
3b8bc2a433
core: allow IO redirection of UI for testing
...
Use of $stdin, $stdout, and $stderr globals makes testing difficult. By
exposing the IO objects as writable attributes, input/output can be more
easily simulated using StringIO or doubles.
2015-03-04 11:23:16 -08:00
8e76ff64d2
Merge pull request #5282 from Scythril/windows_rsync_pre
...
guests/windows: windows rsync needs to create folders before syncing
2015-02-24 09:49:57 -08:00
92762eeb8c
Merge pull request #4943 from maxlinc/winrm_error_handling
...
Improved WinRM error handling (including better `ready?` and `wait_for_ready`)
2015-02-16 10:16:14 -08:00
583254b2b7
Merge branch 'master' of github.com:mitchellh/vagrant into winrm_error_handling
...
Conflicts:
plugins/communicators/winrm/config.rb
plugins/communicators/winrm/shell.rb
test/unit/plugins/communicators/winrm/shell_test.rb
2015-02-16 10:30:12 -05:00
6ba6c7c1c3
Update unit tests for chef_zero provisioner
2015-02-14 22:33:23 +01:00
d6e91483a6
Merge branch 'master' of github.com:mitchellh/vagrant into winrmssl
...
Conflicts:
vagrant.gemspec
2015-02-09 11:10:23 -05:00
7d25a687ca
Add tests for sending metadata
2015-02-04 11:45:02 -05:00
0dde0b3756
Use a real iso env for push tests
2015-02-03 19:19:58 -05:00
a0be121f4f
Revert "Merge pull request #5274 from mitchellh/sethvargo/atlas_api"
...
This reverts commit 7f19284ef4f0284d000b
2015-02-03 06:39:28 +01:00
6fd685e96d
Fix failing tests
2015-02-02 19:24:50 -05:00
39882957ee
Add retry_delay setting to speed up test
2015-01-28 13:41:07 -05:00
5d5e13bc0f
Change authorization error tests to match WinRM 1.3
2015-01-28 13:41:07 -05:00
56a6c85e7d
Windows rsync needs to create folders before syncing
2015-01-28 13:07:36 -05:00
c37c12526a
Merge branch 'master' of github.com:mitchellh/vagrant into winrm_error_handling
...
Conflicts:
vagrant.gemspec
2015-01-28 10:44:47 -05:00
fa38b59049
Merge pull request #5233 from mitchellh/virtualbox-dhcpserver-netmask
...
providers/virtualbox: read netmask from dhcpservers
2015-01-21 17:11:09 -08:00
3f95d5de9f
Merge pull request #5221 from simonvetter/svetter/fixBoxChecksums
...
fix checksum verification for downloaded boxes (fixes #4665 )
2015-01-21 16:05:07 -05:00
1bc364febc
add test for checksum options mapping
2015-01-21 21:40:25 +01:00
88ab9f7402
providers/virtualbox: read netmask from dhcpservers
...
This should fix the cleaning up of the default VirtualBox dhcpserver,
which we've been fighting with for ages over in #3083 . We were checking
for a structure _including_ a netmask, but the driver was not populating
netmask.
2015-01-21 10:51:39 -08:00
853042f2fa
Make sure allowed_synced_folder_types order overrides priority
2015-01-20 16:18:05 -05:00
d781dce8f8
Filter synced folders by allowed_synced_folder_types
2015-01-20 16:18:05 -05:00
29845e926c
Merge branch 'master' into winrm_error_handling
2015-01-20 16:16:48 -05:00
edc867986b
Merge branch 'master' into winrm_error_handling
2015-01-20 16:07:00 -05:00
e07f229f6e
Merge branch 'master' of github.com:mitchellh/vagrant into winrmssl
2015-01-20 16:00:20 -05:00
e756950e2a
Extend has_plugin test for gem name and version
...
The test must ensure that has_plugin does not succeed if an unrelated plugin satisfies the given version spec.
2015-01-20 16:35:57 +01:00
551a26272b
tests extended to new variables
2015-01-14 17:35:44 +02:00
2ecad8bb93
provisioners/ansible: increase connection timeout
...
This change helps to avoid troubles like reported in #5018 and #4860 .
Note that for sake of configuration simplicity, no new `ansible.timeout`
option has been added. The users who want to set a different value can
rely on `ansible.raw_arguments`.
2015-01-12 10:54:01 +01:00
9d74dcdb3d
provisioners/ansible: add missing test coverage
...
Related to Docker provider on a non-linux host, see #4906 and #4071 .
2015-01-12 09:37:16 +01:00
c3cae3d235
provisioners/ansible: add `IdentitiesOnly=yes`
...
This SSH option is always set, except when Vagrant is running from an
operating system fo the Solaris-family, as this parameter is not
supported by SunSSH. Logic taken from
bed1f8335f/lib/vagrant/util/ssh.rb (L116-L121)Fix #5017
2015-01-12 08:58:29 +01:00
114858c7d2
Verify the token is valid when saving
2015-01-09 13:24:53 -05:00
07bb6e549e
Add tests for the login command
2015-01-08 17:16:30 -05:00
0080629a68
Remove :focus tag
2015-01-07 15:51:55 -05:00
39233e802f
Validate pushes in the global config
2015-01-07 15:51:20 -05:00
c4eb0261bb
Add tests for validating push configuration
2015-01-07 13:20:53 -05:00
5b4b387f04
provisioners/chef: fix failing tests
2015-01-06 10:56:28 -08:00
d2874064f4
Use .key? instead of .has_key?
2015-01-05 18:29:01 -05:00
6aeae27889
core: just don't use ** to avoid symbol/strings mixup
...
/cc @sethvargo
2015-01-05 12:37:58 -08:00
2377247ba0
Test that the environment has string keys
2015-01-05 10:57:06 -05:00
eb7eaf74ff
Fix failing push test
2015-01-05 10:56:11 -05:00
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
81de7154e6
Fix failing test
2015-01-04 18:36:29 -05:00
6d116cb152
Fix the default FTP port
2015-01-04 18:29:59 -05:00
e7391359e8
Remove duplicate #parse_host method
2015-01-04 18:05:17 -05:00
d7bd65b4e2
extend the omnibus command builder with an additional download_path parameter
2014-12-16 23:29:47 +01:00
9e7f705bad
extend the Chef provisioner base config object with an 'installer_download_path' property
2014-12-16 22:40:19 +01:00
f7a344fe95
Added test to ensure comm test method checks stderr
2014-12-16 09:20:51 -08:00
288b6c11ff
stub_env is a real helper now :)
2014-12-15 01:29:58 -05:00
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
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
0c7696f11e
Fix SafeExec tests
2014-12-14 23:36:32 -05:00
f06703cdb1
Stub ATLAS_TOKEN in tests
...
Without this stub, the tests will fail if ATLAS_TOKEN is set locally
when running the tests.
2014-12-14 23:28:14 -05:00
fdd7bc3ffd
commands/login: append access token to vagrantcloud => atlas URLs
2014-12-12 14:53:05 -08:00
3e8fdc0ca4
WinRM SSL support
2014-12-11 15:07:34 -05:00
68d82349dd
Fix failing test
2014-12-11 11:15:24 -08:00
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
234adaae63
WinRM SSL support
2014-12-11 14:09:17 -05:00
b5a9477405
Fix default forwarded ports
2014-12-11 13:39:24 -05:00
e7e50d39d9
Fix tests - all pass but auth retry test is extremely slow
2014-12-11 13:23:40 -05:00
62ddd92768
Only forward one port for winrm
2014-12-11 13:22:39 -05:00
2caaf82ae0
Change default transport back to :plaintext, for backwards compatibility
2014-12-11 13:21:58 -05:00
072bb26a30
Change @ssl to @transport
2014-12-11 13:21:58 -05:00
b3480049ad
DRY the Shell: Don't duplicate the Config, especially since there were differing default values
2014-12-11 13:21:58 -05:00
1beb221bf3
Rename no_ssl_peer_verification to ssl_peer_verification, and make it configurable
2014-12-11 13:21:58 -05:00
2b9626f19c
Use Winrm 1.2.0 and fix tests
2014-12-11 13:21:58 -05:00
0506e17778
Update Atlas Push to use new vagrant-login API
2014-12-10 15:11:04 -08:00
7d6a6cd263
Read the ATLAS_TOKEN in vagrant-login
2014-12-10 15:08:43 -08:00
ea8f6b8d04
pushes/atlas: fix tests
2014-12-09 19:32:14 -08:00
02a615a646
Merge remote-tracking branch 'upcoming/master'
2014-12-09 16:18:18 -08:00
9ec16774ac
Fix failing specs
2014-12-09 00:08:23 -08:00
b973186cb5
Add vagrant-login to core ;)
2014-12-08 18:26:36 -08:00
fa7cd37e42
Send the Atlas token
2014-12-08 16:54:19 -08:00
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
8df0b1848c
Just return a symbol
2014-12-08 11:35:15 -08:00
78a4fdd6cd
Be consistent
2014-12-08 11:35:15 -08:00
70b61047c7
Do not support multiple strategies right now
2014-12-08 11:35:15 -08:00
6b48199346
Infer push name when only one strategy is defined, support multiple strategies
2014-12-08 11:35:15 -08:00
4a64da5663
Fix some issues around push, fix tests, add missing translations
2014-12-08 11:35:15 -08:00
44e6ec6df8
pushes/atlas: support custom server address
2014-12-08 11:35:15 -08:00
998c5688e8
pushes/atlas: Look for the uploader bin in the embedded dir
2014-12-08 11:35:15 -08:00
ede14d7daa
Separate local-exec push `script` from `inline`
2014-12-08 11:35:14 -08:00
612eeb2265
Add local-exec push
2014-12-08 11:35:14 -08:00
9d1a43c766
Interpret the app from the CWD
2014-12-08 11:35:14 -08:00
b9e8f6e892
Interpret the current branch to push to Heroku
2014-12-08 11:35:14 -08:00
1f49b7ef62
Remove branch option (it should be interpreted)
2014-12-08 11:35:14 -08:00
c16dc5c9c9
Add heroku push implementation
2014-12-08 11:35:13 -08:00
d4058130e4
Add heroku config
2014-12-08 11:35:13 -08:00
ad15be2e16
Fix a typo in ftp config test
2014-12-08 11:35:13 -08:00
ed605c9aac
Rename Harmony to Atlas, minor config changes
2014-12-08 11:35:13 -08:00
8aaf5dc578
Add the FTP push
2014-12-08 11:35:12 -08:00
80851a887f
Create an Adapter to bridge the APIs between SFTP and FTP libraries
2014-12-08 11:35:12 -08:00
b90253ea8c
Create ftp push config
2014-12-08 11:35:12 -08:00
fefaa8da71
pushes/harmony: use to_s.strip.empty? to check if app is set
2014-12-08 11:35:12 -08:00
1705460880
pushes/harmony: expand dir relative to Vagrantfile root path
2014-12-08 11:35:12 -08:00
efffc5f2f7
push/harmony: basic push implementation
2014-12-08 11:35:11 -08:00
168715ad7d
push/harmony: ability to set uploader path
2014-12-08 11:35:11 -08:00
e7b0661a93
pushes/harmony: boilerplate, config
2014-12-08 11:35:11 -08:00
41ac448ba8
Add tests for Push config merging and finalizing
2014-12-08 11:35:11 -08:00
111a43552e
Add tests for Environment#pushes and #Enviroment#push
2014-12-08 11:35:11 -08:00
f3c35855f0
Add a newline because #ocd
2014-12-08 11:35:11 -08:00
7f6a4fa3bd
Add tests for plugin manager push_configs
2014-12-08 11:35:11 -08:00
03b8105571
Super primitive implementation of Environment#push
2014-12-08 11:35:10 -08:00
b6c5ca6b7a
Add Push command and tests
2014-12-08 11:35:10 -08:00
d79a0d52dd
Do not use Enumerable in Registry
...
Calling methods like #first in Registry is misleading because it returns
a different result than registry.get(registry.keys.first).
2014-12-08 11:35:10 -08:00
c0b107ff69
Add Registry#empty? to check if a registry has any items
2014-12-08 11:35:10 -08:00
2b03838fba
Make Registry enumerable
...
Registry already responds to #each, so including the Enumerable module
gives us nice methods like #select and #collect fo' free!
2014-12-08 11:35:10 -08:00
bc4bbb9fc0
Add #length and #size methods to Registry
2014-12-08 11:35:10 -08:00
60a8472891
Use a pushes registry instead of data hash
2014-12-08 11:35:09 -08:00
0e824cc471
Rename file push to noop push
2014-12-08 11:35:09 -08:00
8a7e546972
Add preliminary File pusher (incomplete)
2014-12-08 11:35:09 -08:00
72afdce630
Issue #4895 : Support grains config for salt
2014-12-02 18:01:09 -04:00
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
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
703c1f153b
providers/virtualbox: fix flaky test when rsync is not installed
...
test-only change
when rsync is not installed on the machine running the unit tests, the
prepare_nfs_settings tests end up calling the :nfs_installed capability
on the host, which fails on the fake host wired up in tests.
this adds some explicit stubbing to prevent the implicit assumption that
rsync is installed.
2014-11-30 22:03:27 -06:00
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
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
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
1c884fa4e5
provisioners/ansible: Show Ansible command when VAGRANT_LOG=debug
2014-11-25 08:12:43 +01:00
f8a2322459
core: only delete state if not created on initialize only
...
/cc @sethvargo
2014-11-10 16:29:19 -08:00
5b1211fc63
Merge pull request #4792 from mwrock/state_refresh_fix
...
fixes infinite loop in machine state call if provider calls machine.action
2014-11-10 12:24:24 -05:00
f232dc38c9
Automatically install Chef when provisioning with Chef
2014-11-07 15:56:22 -05:00
b7c03ddbe2
Update config tests to reflect new structure
2014-11-07 15:56:21 -05:00
dc628cd722
fixes infinite loop in machine state call if provider calls machine.action
2014-11-06 08:51:47 -08:00
1464a63928
Merge pull request #4777 from voxik/remove-useless-expect-with
...
Remove useless expect_with
2014-11-04 09:29:29 -05:00
dff40a193d
Remove useless expect_with.
...
This seems to be relict of old days and it just forces unnecessary
dependency on Ruby's test unit.
2014-11-04 10:01:32 +01:00
59eb0ad2e8
Add Chef Apply provisioner
2014-10-30 15:32:15 -04:00
3b416db299
Tabs -> Spaces
2014-10-30 13:43:26 -04:00
f5b9044e39
Add tests for Chef Zero config
2014-10-30 13:43:26 -04:00
a8a35757ee
Add tests for Chef Solo config
2014-10-30 13:43:26 -04:00
9c56061fa9
Add tests for Chef Client config
2014-10-30 13:43:25 -04:00
8b3ec500c8
Remove :focus tag (accidentally left from previous commit)
2014-10-30 13:43:25 -04:00
f009db6101
Add tests for Chef base Config
2014-10-30 13:43:25 -04:00
f4dec575ed
core: Vagrant::Util::Keypair for generating keypairs
2014-10-24 09:33:44 -07:00
97f9948fce
core: provisioners are defined differently now
2014-10-23 18:40:14 -07:00
13dc1832b6
test: fix test for default provider
2014-10-23 16:41:24 -07:00
b7478e09f3
core: clean up default logic
2014-10-23 15:59:27 -07:00
768d453739
core: Environment#default_provider can look into machines
2014-10-23 15:52:42 -07:00
ad758bf69a
core: prefer providers in the Vagrantfile [GH-3812]
2014-10-23 15:32:54 -07:00
f0a73c7c05
core: call #state in any #action call [GH-4513]
2014-10-23 12:20:16 -07:00
4827469dee
core: recognize more complex content types for json [GH-4525]
2014-10-23 11:26:56 -07:00
2856df79ac
core: Vagrant.has_plugin? can take version requirements [GH-4650]
2014-10-23 10:52:02 -07:00
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
5036d16461
update CHANGELOG
2014-10-23 09:15:47 -07:00
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
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
Jean-Francois Bibeau
Jeff Johnson
Volodymyr Babchynskyy
Mario Rodas
Dan Duvall
Mitchell Hashimoto
Shawn Neal
Max Lincoln
Michael Lopez
Seth Vargo
Mitchell Hashimoto
Richard Guin
Paul Hinze
Simon Vetter
Paul Hinze
mbrodala
Gilles Cornu
Torben Knerr
Ken Crowell
Seth Vargo
Matt Wrock
Vít Ondruch