2f81669394
Move shell_cmd to a method in SSH::Communicator
...
This allows shell_cmd to be overridable by plugins/patches without
having to override the entire (large) shell_execute method
2015-04-13 13:45:17 -04:00
ffcb58bcd9
When using environments, allow specifying the 'main manifest' using manifest_path and manifest_file.
2015-04-12 12:31:31 -07:00
0efb9a3932
Fix resolution of puppet path for <4.0
2015-04-12 12:29:50 -07:00
b40426aca5
Properly parse out and use the environment's manifest file which is specified in environment.con.
2015-04-12 02:16:54 -07:00
c8f300e5f5
Correct environment path option to puppet apply.
2015-04-12 01:43:19 -07:00
c701bab253
Properly handle various combinations of Puppet options being specified.
2015-04-12 01:26:41 -07:00
cff7c52716
Use localized error message. Update strings for puppet provisioner errors.
2015-04-12 01:25:40 -07:00
7a4e7929f8
Don't parse env metadata until provisioning time. TBD: make it functional
2015-04-12 01:18:49 -07:00
3ee47acb42
Remove debug output
2015-04-12 01:18:12 -07:00
e2c68fc12d
Correct environment path config name.
2015-04-11 23:48:18 -07:00
3a2a9a3b94
Add a binary_path option to the puppet provisioner to match the chef provisioner, and support new puppet 4 install location.
2015-04-11 23:35:25 -07:00
cf847e0410
Merge branch 'master' into environments_wip
...
Conflicts:
Vagrantfile
vagrant.gemspec
2015-04-11 13:33:32 -07:00
e8843b8648
Merge branch 'master' of https://github.com/mitchellh/vagrant
2015-04-11 13:03:18 -07:00
c0f43c362c
Use service command to restart docker, not upstart.
...
upstart ships by default on Ubuntu, but not on Debian, and service works
everywhere. Fixes #5245 .
2015-04-10 10:06:21 -07:00
415837c544
moved function to platform utils, added unit test as per @sethvargo
2015-04-06 16:51:55 -04:00
13d4899d16
Cleanup style
2015-04-02 10:11:41 -04:00
ca3cb385d4
fix ftp push check bug
...
list method is not safe to check if a dir exist or not on remote.
2015-04-02 14:44:11 +08: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
9a0aab4bd7
Improved behavior for case if vlan_id is not set
2015-03-30 10:17:29 -06:00
9e23d16d9c
merged vlan_id changes for hyperv by tomassrnka
2015-03-30 08:37:29 -06:00
fd557592d4
only set EFI secure boot for gen 2 machines in hyperv provider
2015-03-30 20:00:16 +07:00
e745436df3
provisioners/ansible: disable color if Vagrant has no color [GH-5531]
2015-03-28 19:05:54 -05:00
b43413525f
guests/freebsd: fix call of set -i : missing extension
...
Sed on freebsd seems to be mores strict than on other
platforms about use of -i: the extension is not optional.
Signed-off-by: Michael Adam <obnox@samba.org>
2015-03-23 13:31:07 +01:00
7d17574a76
changing windows/virtualbox shared path names to UNC format to allow > 256 characters
2015-03-18 15:29:43 -04:00
be81f09a60
Supporting a named Dockerfile for Docker 1.5.0
2015-03-13 17:30:42 -07:00
992c148169
Ignore Windows NICs with nil :net_connection_id
...
When upping a Win XP box, vagrant found a lot of "virtual" network
connections that did not have DHCP enabled, and tried to configure them
for DHCP. This did not work because their :net_connection_id is nil.
Ignoring these network connections enabled the XP box to be upped.
2015-03-13 11:49:15 -07:00
291db96510
communicators/winrm: don't stop task on idle end
...
StopOnIdleEnd was set in the task definition for elevated/privileged
windows guest scripts. This setting:
> specifies that the task stops when the idle condition ceases to be true [1]
The "idle condition" is something that Windows periodically checks for,
and it's defined by a bunch of criteria like user presence/absence, CPU
/ IO idle time, etc. [2]
Telling our provisioner to stop the task if the "idle condition" ceases
to be true is a recipe for some sporadically stopped tasks, which seems
like precisely the behavior being reported in #5362 .
I'm pretty sure this fixes #5362
[1] https://msdn.microsoft.com/en-us/library/cc248332.aspx
[2] https://msdn.microsoft.com/en-us/library/windows/desktop/aa383561%28v=vs.85%29.aspx
2015-03-12 15:25:40 -05:00
71c40bdf6a
File architecture string should be x86
...
As of 2014.7.0, Salt has changed their file naming for 32-bit from win32
to x86.
2015-03-06 13:14:11 -08:00
2f4a0af5d1
Fix issue #4152 : Salt minion bootstrapping
...
Copy the config after we know the installer exits. Also rev the
installed version to 2014.7.1 (latest stable as of 3/4/2015)
2015-03-04 18:08:07 -08:00
0289ab986c
Salt Provisioner: Added a 'custom' option to install_type to allow more flexibility in passing arguments to the bootstrap script. Updated the docs.
2015-03-04 15:05:24 -07:00
4f44ae5379
providers/virtualbox: interpolation added to error [GH-5308]
2015-02-24 10:48:59 -08:00
713be4c5b9
provisioners/chef: actually use command -v
2015-02-24 10:12:25 -08:00
c1e2d36090
provisioners/chef: use command -v to check for binary [GH-5167]
2015-02-24 10:11:05 -08:00
808a86a918
Merge pull request #5175 from hdeheer/patch-1
...
synced/folders/rsync Add 'IdentitiesOnly=yes'
2015-02-24 10:06:24 -08:00
66b199afb7
Merge pull request #5182 from clintoncwolfe/add-ssh-key-replacement-for-solaris
...
guests/solaris: Add insert/remove public key guest capability for solaris
2015-02-24 10:05:17 -08:00
47ea548026
Merge pull request #5210 from tomassrnka/5209-vm-import-secure-boot
...
providers/hyperv: import respects box's original Secure Boot setting
2015-02-24 10:03:13 -08:00
4e32155b95
Merge pull request #5261 from blairham/revert-4693-master
...
Revert "Rename Windows guest without reboot"
2015-02-24 09:59:53 -08:00
eca5ab0a4d
Merge pull request #5277 from Keeguon/fedora21
...
detect fedora 21
2015-02-24 09:58:20 -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
55d54b5832
Merge pull request #5290 from channui/solaris11-plugin
...
guests/solaris11: Copy linux support for insert_public_key and remove_public_key to solari...
2015-02-24 09:48:02 -08:00
104f2106ce
Merge pull request #5302 from cubetto/fix-docker-no-space-to-build
...
providers/docker: build docker image from /var/lib/docker
2015-02-24 09:47:08 -08:00
2dfc1e1c49
Merge pull request #5303 from SchnWalter/add-sl7-flavor
...
guests/redhat: Add Scientific Linux to RHEL 7 flavors.
2015-02-24 09:45:56 -08:00
734b0d6695
Merge pull request #5315 from jimmidyson/non-existent-docker-group
...
provisioners/docker: only add user to docker group if docker group exists
2015-02-24 09:45:03 -08:00
d399bdae8f
Merge pull request #5320 from epicagency/master
...
providers/virtualbox: support Regexp usage for bridge configuration
2015-02-24 09:43:36 -08:00
e5d3a561cf
Merge pull request #5326 from timsutton/ssh-insert-key-darwin
...
guests/darwin: Support insert_public_key and remove_public_key on darwin guest
2015-02-24 09:36:41 -08:00
7900fc65fc
Merge pull request #5349 from agreenbhm/master
...
hosts/windows: update host_info.ps1
2015-02-24 09:26:27 -08:00
c01c4bf41e
remove extra spaces on plugin.rb ;).
2015-02-20 20:49:50 +01:00
1eedc2b5f1
Added specific support for Debian 8 (aka jessie) to permit proper vagrant halt execution
2015-02-20 20:15:05 +01:00
a1f6bfb1f2
Update host_info.ps1
2015-02-18 11:53:03 -05:00
2557e5f3f8
Update host_info.ps1
...
Changed method for getting IP addresses. Windows built-in VPN IP addresses do not appear in list using Get-WMIObject, causing shared folders to fail.
2015-02-17 13:04:54 -05: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
8adc10f295
Update chef_zero provisioner to use real chef-zero/local-mode to support cookbook version constraint
2015-02-14 22:32:16 +01:00
74ffcb27d6
Add 'enable_reporting' attribute for chef provisioner
2015-02-14 22:28:32 +01:00
c6e16beaa5
Support insert_public_key and remove_public_key on darwin guest
...
- fixes #5204
- darwin-specific sed arguments thanks to @elatt
2015-02-11 12:21:23 -05:00
90719dc82f
vagrant duplicates >= eth2 when defining two config.vm.network :private_network
...
When a vagrant box has two private network ips /etc/network/interfaces
will duplicate eth2 and bigger. sed matches greedy, so the first
#VAGRANT-END matches. This will result in:
/etc/network/interfaces:29: interface eth2 declared allow-auto twice
/sbin/ifup: couldn't read interfaces file "/etc/network/interfaces"
2015-02-11 15:37:41 +01:00
887f94260e
Support Regexp usage for bridge configuration
2015-02-11 11:07:03 +01:00
be2643d40d
Only add user to docker group if docker group exists (doesn't in recent Fedora docker-io installs)
2015-02-10 18:11:39 +00:00
d6e91483a6
Merge branch 'master' of github.com:mitchellh/vagrant into winrmssl
...
Conflicts:
vagrant.gemspec
2015-02-09 11:10:23 -05:00
02c0bfafc6
Add Scientific Linux to RHEL 7 flavors.
2015-02-08 02:56:44 +02:00
2e659bf12c
Update host_machine_build_dir.rb
2015-02-07 20:33:55 -03:00
a6361a750c
Copy linux support for insert_public_key and remove_public_key to solaris11.
2015-02-04 16:58:17 -06:00
7d25a687ca
Add tests for sending metadata
2015-02-04 11:45:02 -05:00
257ff57772
Remove message for now
2015-02-03 21:06:51 -05:00
82b24e9a8f
Pass in a message to the command as well
2015-02-03 19:20:27 -05:00
d29a474fbb
Cleanup that syntax
2015-02-03 19:20:12 -05:00
edbc3e74d4
Pass metadata to push command
2015-02-03 19:19:51 -05:00
52d0df3296
Add --message option to `vagrant push`
2015-02-03 19:19:08 -05:00
b776fe74b8
detect fedora 21
2015-02-03 10:23:35 +01:00
7784ee2d09
Revert "Rename Windows guest without reboot"
2015-01-28 20:00:24 -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
6378deacd6
Merge pull request #5225 from mitchellh/winrm-fs-dependency
...
Use winrm-fs for file uploads
2015-01-26 09:55:31 -08: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
a317a4d50d
Ensure allowed_synced_folder_types is a list of symbols
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
31163da0d5
Use winrm-fs for file uploads
...
Replace the Vagrant native winrm file upload functionality with the winrm-fs gem.
2015-01-20 11:45:57 -08:00
0cfe5ebfa6
Merge pull request #5222 from simonjbeaumont/fix-regex
...
Allow colon in NFS ID regex
2015-01-20 09:58:31 -05:00
8519e174f0
Merge pull request #5220 from voxik/fix-permissions
...
Remove unneeded executable permissions.
2015-01-20 09:53:48 -05:00
3deed353ae
Allow colon in NFS ID regex
...
Signed-off-by: Si Beaumont <simon.beaumont@citrix.com>
2015-01-20 14:11:42 +00:00
7d3b5352da
Remove unneeded executable permissions.
2015-01-20 11:53:30 +01:00
69b7200c35
Switch to docker.com
...
docker.io seems to be deprecated & handled differently from docker.com; see https://twitter.com/clint_newsom/status/557290529810313217
2015-01-19 13:58:45 -08:00
21e2f33fb0
Fix for: [hyperv]: VM import process does not respect Secure Boot option from image #5209
2015-01-17 21:31:37 +01:00
87195f8336
use :bridge instead of network_name to align with site docs
2015-01-17 11:39:32 -08:00
0b6e65380a
select a switch ased on a network_name
2015-01-17 01:06:56 -08:00
a9ac168b19
Added possibility to configure memory, cpus count, and vmname in vagrantfile
2015-01-14 16:59:01 +02:00
75de0e3dd7
Add insert/remove public key guest capability for solaris (identical to linux)
2015-01-13 21:45:06 -05:00
17a0d08040
Add chef_install(ed?) guest capability for omnios
2015-01-13 17:45:01 -05:00
cdd5d54208
provisioners/ansible: fix a typo in a comment
...
[ci skip]
2015-01-13 18:52:47 +01:00
7e5391c0f5
synced/folders/rsync Add 'IdentitiesOnly=yes'
...
Added IdentiesOnly=yes to avoid "Too Many Authentication Failures" error
2015-01-12 15:19:43 +01:00
28e0646dc2
Fix typo error in CHANGELOG
...
Close #4860
[ci skip]
2015-01-12 10:59:07 +01: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
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
253f0637e5
Add a -t command for setting the login token
2015-01-08 17:16:21 -05:00
7529b66ea2
Disable insert_key for boot2docker host
...
Vagrant >1.7 is unable to login to the default boot2docker host if it has
been halted and brought back up again.
This is because the insecure SSH keypair is replaced but boot2docker doesn't
persist filesystem changes between reboots. So when next brought up Vagrant
tries to use the new keypair which is no longer valid and subsequently isn't
able to login.
Prevent this from happening by disabling the `ssh.insert_key` option on
versions where it is available.
2015-01-08 11:23:37 +00:00
39233e802f
Validate pushes in the global config
2015-01-07 15:51:20 -05:00
6b51526ba2
Validate push configuration in the environment
2015-01-07 11:43:26 -05:00
e828719c2f
Add logging to vagrant-login
2015-01-07 11:43:14 -05:00
95e1c19f22
provisioners/puppet: fix exception with module paths [GH-5123]
2015-01-06 22:50:24 -08:00
1fdee9e5c4
Merge pull request #4813 from derdanne/funtoo-guest-network-configuration
...
Update configure_networks.rb for funtoo
2015-01-06 16:49:44 -05:00
661657c63f
provisioners/chef: fix failing test
2015-01-06 10:57:25 -08:00
5b4b387f04
provisioners/chef: fix failing tests
2015-01-06 10:56:28 -08:00
de6b55d007
provisioners/puppet: use predictable synced folders
2015-01-06 10:48:31 -08:00
155516fb6c
provisioners/chef: use synced folder cache instead of counter
2015-01-06 10:31:13 -08:00
79873cdb44
communicators/winrm: detect parse errors in powershell and error
...
/cc @sneal - Any better way to do this?
2015-01-05 16:53:17 -08:00
7609932a6f
Do not use keyword arguments for string keys
2015-01-05 18:58:57 -05:00
d2874064f4
Use .key? instead of .has_key?
2015-01-05 18:29:01 -05:00
5e0f91f592
ENV returns nil, not empty strings
2015-01-05 16:04:00 -05:00
2bd22c9663
Turn on Atlas debug logging if Vagrant is logging
2015-01-05 15:51:19 -05:00
dd62d3c5f1
Merge branch 'master' into GH4201-ShowRSyncOutput
2015-01-05 14:42:08 -06:00
d2e1500c74
Review comments applied. Removed changelog. Changed showoutput to verbose.
2015-01-05 14:36:00 -06:00
c4502737c8
Revert "Symbolize and stringify keys in options hash"
...
This reverts commit 1699c92eec
2015-01-05 12:35:31 -08:00
d5dae4b492
Merge pull request #5042 from legal90/fix-post-comm
...
providers/virtualbox: Add 'post-comm' to the list of valid events
2015-01-05 12:00:34 -08:00
d482e0ca10
Merge pull request #5085 from evverx/provision-with
...
Enable provision with --provision-with flag
2015-01-05 11:45:10 -08:00
4849ec8f7c
guests/solaris: merge config properly [GH-5092]
2015-01-05 09:52:19 -08:00
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
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
1699c92eec
Symbolize and stringify keys in options hash
2015-01-05 10:48:39 -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
f11ec8ff1a
Make parent directories when uploading to FTP
2015-01-04 18:06:51 -05:00
6a3d99a9a2
Output to the UI when uploading via FTP
2015-01-04 18:06:32 -05:00
50c1c0756e
Expand file paths relative to the root_path
2015-01-04 18:06:22 -05:00
fd3c1c6ebb
Add a logger when uploading to FTP
2015-01-04 18:06:05 -05:00
e330875303
Exclude certain directories by default
2015-01-04 18:05:46 -05:00
e7391359e8
Remove duplicate #parse_host method
2015-01-04 18:05:17 -05:00
944853ab47
Use 21 for the default port
2015-01-04 16:24:26 -05:00
2620042c26
Fix catching "Start-VM" exceptions on Hyper-V during starting up VM
2015-01-04 00:05:50 +01:00
084d2c06de
enable symlinks before adding shared folder
2015-01-01 16:00:17 -05:00
9aa20d5d6b
Added ability to run salt orchestrations to salt provisioner
2014-12-31 10:31:35 -08:00
43bb715c00
Enable provision with --provision-with flag
2014-12-30 06:10:52 +03:00
97d5a6ebfc
Log chef-zero instead of chef-solo
2014-12-28 12:52:54 -05:00
1cfc5acea3
Update Chef plugin description
2014-12-24 03:53:29 +03:00
55a90445cd
Fix new-style Network Device Naming on CentOS7+VMwarefusion
2014-12-21 16:25:11 +09:00
e828927cee
providers/virtualbox: Add 'post-comm' to the list of valid events
2014-12-21 01:09:55 +03:00
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
f2b494c2cc
don't forget to pass the `installer_download_path` from the config!
2014-12-17 00:48:34 +01:00
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
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
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
954289beb6
Use new Chef Omnibus URL
2014-12-16 12:16:08 -05:00
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
185740163c
Don't reorder config in /etc/network/interfaces
2014-12-15 19:21:22 +00:00
bce0d1acc9
Pushes are strings
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
c0d4b39eea
Force opts to be options
...
cb6f3e5Fixes #4960
2014-12-14 23:46:39 -05:00
214a79e057
Pushes are hashed by name, not strategy.
...
@mitchellh this is a partial revert of 84ae22e84ae22e
2014-12-14 23:32:32 -05:00
9d1834a3c9
Fix line breaks
2014-12-13 21:08:31 +01:00
fdd7bc3ffd
commands/login: append access token to vagrantcloud => atlas URLs
2014-12-12 14:53:05 -08:00
84ae22e976
kernel/v2: fix push strategy config lookup
2014-12-12 01:36:39 -08:00
669c9fc013
commands/push: push strategy should be string
2014-12-12 01:27:22 -08:00
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
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
6596f7f29d
Merge pull request #4937 from mitchellh/sethvargo/error_format
...
Use the new Rails error format
2014-12-11 16:54:45 -08:00
3e8fdc0ca4
WinRM SSL support
2014-12-11 15:07:34 -05: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
24de8a1fb7
Just use ready?
2014-12-11 13:22:39 -05:00
ba7b964b1e
Better error handling for WinRM (using winrm v1.3.0.dev.2)
2014-12-11 13:22:39 -05:00
24f919c4d3
Fix accessors used by in communicator.rb
2014-12-11 13:22:39 -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
02f4adc895
Fix broken variable references
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
243cc5dc37
config.rb: set default port based on @ssl
2014-12-11 13:20:22 -05:00
52d8fddf38
shell.rb: fix precedence
2014-12-11 13:20:22 -05:00
2f52a9c15c
Add winrmssl port forward (port 5986)
2014-12-11 13:20:22 -05:00
4455d2401b
Add ssl option to winrm config.rb
2014-12-11 13:19:09 -05:00
a99d32f60a
Add WinRM over SSL support
2014-12-11 13:19:09 -05:00
9a575a79ec
Use the new Rails error format
2014-12-11 01:21:46 -08: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
ed688ec775
Merge pull request #4929 from kalifg/master
...
Add back creation of mount point
2014-12-10 09:18:42 -08:00
2a285d7655
hosts/bad: escape regexp properly [GH-4922]
2014-12-10 09:16:45 -08:00
e65ae7b543
Add back creation of mount point
...
Accidentally removed in ad4b30dd
2014-12-10 10:56:30 -06:00
02a615a646
Merge remote-tracking branch 'upcoming/master'
2014-12-09 16:18:18 -08:00
bb7b954a5f
Use the new namespace in Atlas config
2014-12-08 22:06:41 -08:00
62065e013a
Read and return login errors from Atlas
2014-12-08 18:26:36 -08:00
3d8a1ec3fc
Fix some rename shit
2014-12-08 18:26:36 -08:00
b973186cb5
Add vagrant-login to core ;)
2014-12-08 18:26:36 -08:00
2e4f854725
Vagrant Cloud -> Atlas
2014-12-08 17:42:29 -08:00
fa7cd37e42
Send the Atlas token
2014-12-08 16:54:19 -08:00
118e223c33
provisioners/ansible: use Docker proxy when needed
...
Close #4071
Credits and best thanks to @jabclab
2014-12-08 21:43:21 +01: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
9e5b587e66
Re-add TODO
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
7e3de3951e
Do not check for a branch until after we have found git
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
ce380a3b12
Remove safe_exec (not being used)
2014-12-08 11:35:13 -08:00
4282fcf55e
Add heroku push plugin file
2014-12-08 11:35:13 -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
fb05563762
Load the translations in Atlas
2014-12-08 11:35:13 -08:00
1d7f4f26be
Provide a better error message for the FTP push
2014-12-08 11:35:13 -08:00
dc8b36b31d
Allow = methods for include and exclude
2014-12-08 11:35:13 -08:00
ed605c9aac
Rename Harmony to Atlas, minor config changes
2014-12-08 11:35:13 -08:00
c8bdf53c7e
Rename push environment to env
2014-12-08 11:35:12 -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
eb5cecc782
Create ftp push plugin with custom i18n loading
2014-12-08 11:35:12 -08:00
b90253ea8c
Create ftp push config
2014-12-08 11:35:12 -08:00
913dafd3aa
pushes/harmony: remove unneceessary if
2014-12-08 11:35:12 -08:00
81f748347e
pushes/harmony: fixes from @sethvargo
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
f3f4f4aeb6
pushes/harmony: stub I18n
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
9af7675bd3
Use a more readable version for setter
2014-12-08 11:35:11 -08:00
1121e96cf7
Remove TODO comment about duplicate code
2014-12-08 11:35:11 -08:00
411c7d6f75
Define finalize! and __compiled_pushes for Push config
2014-12-08 11:35:11 -08:00
190da26404
Push does not have access to @machine
2014-12-08 11:35:10 -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
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
9e9362d976
Fix broken rsync cap for Solaris guests
2014-12-08 09:42:13 -05:00
3800103228
provisioners/ansible: improve comment wording
...
Get rid of the Joker, thanks to @maspwr :)
2014-12-07 22:34:19 +01:00
40a22ff99a
providers/docker: fix support of agent forwarding
2014-12-07 11:02:50 +01:00
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
a2778c0a6b
Merge branch 'master' into GH4201-ShowRSyncOutput
2014-12-03 13:11:56 -06: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
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
1ed31afeba
GH-4201: Cleaned up some leftover junk I missed removing
2014-11-25 14:39:56 -06:00
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
5de3f30bb0
GH-4201: Added rsync__showoutput to display rsync output to console
2014-11-25 12:38:41 -06:00
1c884fa4e5
provisioners/ansible: Show Ansible command when VAGRANT_LOG=debug
2014-11-25 08:12:43 +01:00
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
f86189a2fe
Add Env.with_clean_env for resetting the Ruby and Rubygems environment
2014-11-10 12:00:23 -05:00
f232dc38c9
Automatically install Chef when provisioning with Chef
2014-11-07 15:56:22 -05:00
a8fa4bccc7
Add Chef::Config#install and Chef::Config#version options
2014-11-07 15:56:21 -05:00
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
b19abebdf0
Grammar fix to the network interface bridge question
2014-10-31 15:16:02 -04:00
59eb0ad2e8
Add Chef Apply provisioner
2014-10-30 15:32:15 -04:00
514101816b
Fix alignment in the Chef Client config
2014-10-30 15:32:10 -04:00
af9177550a
Properly handle empty/nil values in Chef Solo config
2014-10-30 13:43:26 -04:00
7e71d72db8
Check for empty chef_server_url and validation_key_path
2014-10-30 13:43:25 -04:00
721edf70b9
Make Chef Zero lowercase in validation (conforms to other keys)
2014-10-30 13:43:25 -04:00
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
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
8990e18e6d
fix copy and paste bug
2014-10-27 18:23:00 +01:00
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
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
eeb11ec653
Merge branch 'master' of github.com:tarrant/vagrant
2014-10-24 13:54:16 -07:00
70fece7a99
Add support for DHCP on tinycore
2014-10-24 13:52:35 -07:00
ba994baa65
Revert "guests/tinycore: error if DHCP [GH-4699]"
...
This reverts commit 64139f2158
2014-10-24 13:52:06 -07:00
ea983e32c8
hosts/*: NFS prune regexp matches file paths [GH-3815]
2014-10-24 12:16:53 -07:00
64139f2158
guests/tinycore: error if DHCP [GH-4699]
2014-10-24 11:24:16 -07:00
5418e6b85e
guests: add remove_public_key to most guests
2014-10-24 10:05:01 -07:00
94b2a8a56b
communicators/ssh: insert random key, remove insecure key
2014-10-24 09:58:18 -07:00
37a4000722
providers/virtualbox: more descriptive error if empty version [GH-4657]
2014-10-24 09:20:08 -07:00
da91741b7c
provisioners/shell: fix typo
2014-10-23 22:49:26 -07:00
a7d3458abc
provisioners/shell: retry getting SSH info a few times [GH-3924]
2014-10-23 22:48:48 -07:00
cc01f01684
hosts/linux: don't use sudo to write NFS if writable [GH-2643]
2014-10-23 22:25:38 -07:00
6ea8dc8e20
core: cleaner output of what provisioner is running if named
2014-10-23 18:47:03 -07:00
97f9948fce
core: provisioners are defined differently now
2014-10-23 18:40:14 -07:00
aa981cf4ec
hosts/bsd: only use sudo if we can't write /etc/exports [GH-2643]
2014-10-23 17:43:58 -07:00
ad758bf69a
core: prefer providers in the Vagrantfile [GH-3812]
2014-10-23 15:32:54 -07:00
b656bf4ae5
providers/docker: build output [GH-3739]
2014-10-23 15:03:09 -07:00
1e324093a5
provisioners/ansible: spare machine.ssh_info calls
...
As a result of #4670 and the safe decision to not memoize
machine.ssh_info (see 89a4a29d655036d16461
2014-10-23 22:58:01 +02:00
f23c5ebc46
commands/plugin: list puts plugin namein machine readable output
...
[GH-4506]
2014-10-23 12:00:46 -07:00
06defb37c7
commands/up: if all machines autostart:false, start none [GH-4552]
2014-10-23 11:46:22 -07:00
37a04b4bfc
provisioners/puppet: use correct error class [GH-4520]
2014-10-23 10:46:11 -07:00
4ffaaf119e
providers/virtualbox: more hints when choosing interface [GH-4463]
2014-10-23 10:24:07 -07:00
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
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
d04ec704c1
update CHANGELOG
2014-10-23 10:12:27 -07:00
4b4255c6d1
Merge pull request #4492 from tboerger/feature/suse-fixes
...
SUSE naming and capability fixes
2014-10-23 10:11:28 -07:00
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
4c0aa0d9cb
update CHANGELOG
2014-10-23 10:04:58 -07:00
fca6428ecd
Merge pull request #4518 from lunetics/master
...
guests/freebsd: allow NFS version param
2014-10-23 10:03:41 -07:00
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
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
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
3f01a99148
provisioners/shell: rename shell_args to powershell-args
2014-10-23 09:53:14 -07:00
f0a4e26d27
Merge pull request #4548 from ebelew/shellargs
...
Update powershell provisioning to fix #4547
2014-10-23 09:50:50 -07:00
Aaron Quint
Ben Hines
Brandon Matthews
Jean-Francois Bibeau
Seth Vargo
wucheng
Jeff Johnson
Volodymyr Babchynskyy
ssugar
Mario Rodas
Michael Adam
Adam Duro
Ben Jansen
Paul Hinze
Jamezz
Tim O'Guin
Mitchell Hashimoto
Mitchell Hashimoto
gpkfr
agreenbhm
Shawn Neal
Max Lincoln
Michael Lopez
Timothy Sutton
Frank Baalbergen
Hugues Lismonde
Jimmi Dyson
Schneider Werner-Walter
cubetto
Christopher Chan-Nui
Félix Bellanger
Blair Hamilton
Richard Guin
Si Beaumont
Vít Ondruch
Clay Allsopp
Tomas Srnka
Matt Wrock
Clinton Wolfe
Gilles Cornu
Hubert
Dan Carley
Chad Maloney
William Kolean
Andrew Mains
Evgeny Vereshchagin
Masahiro Ono
Mikhail Zholobov
Torben Knerr
Barry Kelly
Douézan-Grard Guillaume
Peter Ericson
Michael Dwyer
Atha Kouroussis
Jeff Quast
Ken Crowell
Paul Hinze
Daniel Klockenkämper
Chris Jones
Teemu Matilainen
Fabian Ruff
Adam Spiers
Tarrant