Ben Hines
c8f300e5f5
Correct environment path option to puppet apply.
2015-04-12 01:43:19 -07:00
Ben Hines
c701bab253
Properly handle various combinations of Puppet options being specified.
2015-04-12 01:26:41 -07:00
Ben Hines
cff7c52716
Use localized error message. Update strings for puppet provisioner errors.
2015-04-12 01:25:40 -07:00
Ben Hines
7a4e7929f8
Don't parse env metadata until provisioning time. TBD: make it functional
2015-04-12 01:18:49 -07:00
Ben Hines
3ee47acb42
Remove debug output
2015-04-12 01:18:12 -07:00
Ben Hines
e2c68fc12d
Correct environment path config name.
2015-04-11 23:48:18 -07:00
Ben Hines
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
Ben Hines
cf847e0410
Merge branch 'master' into environments_wip
...
Conflicts:
Vagrantfile
vagrant.gemspec
2015-04-11 13:33:32 -07:00
Ben Hines
e8843b8648
Merge branch 'master' of https://github.com/mitchellh/vagrant
2015-04-11 13:03:18 -07:00
Brandon Matthews
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
Jean-Francois Bibeau
415837c544
moved function to platform utils, added unit test as per @sethvargo
2015-04-06 16:51:55 -04:00
Seth Vargo
13d4899d16
Cleanup style
2015-04-02 10:11:41 -04:00
wucheng
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
Jeff Johnson
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
Volodymyr Babchynskyy
9a0aab4bd7
Improved behavior for case if vlan_id is not set
2015-03-30 10:17:29 -06:00
Volodymyr Babchynskyy
9e23d16d9c
merged vlan_id changes for hyperv by tomassrnka
2015-03-30 08:37:29 -06:00
ssugar
fd557592d4
only set EFI secure boot for gen 2 machines in hyperv provider
2015-03-30 20:00:16 +07:00
Mario Rodas
e745436df3
provisioners/ansible: disable color if Vagrant has no color [GH-5531]
2015-03-28 19:05:54 -05:00
Michael Adam
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
Jean-Francois Bibeau
7d17574a76
changing windows/virtualbox shared path names to UNC format to allow > 256 characters
2015-03-18 15:29:43 -04:00
Adam Duro
be81f09a60
Supporting a named Dockerfile for Docker 1.5.0
2015-03-13 17:30:42 -07:00
Ben Jansen
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
Paul Hinze
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
Jamezz
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
Jamezz
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
Tim O'Guin
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
Mitchell Hashimoto
4f44ae5379
providers/virtualbox: interpolation added to error [GH-5308]
2015-02-24 10:48:59 -08:00
Mitchell Hashimoto
713be4c5b9
provisioners/chef: actually use command -v
2015-02-24 10:12:25 -08:00
Mitchell Hashimoto
c1e2d36090
provisioners/chef: use command -v to check for binary [GH-5167]
2015-02-24 10:11:05 -08:00
Mitchell Hashimoto
808a86a918
Merge pull request #5175 from hdeheer/patch-1
...
synced/folders/rsync Add 'IdentitiesOnly=yes'
2015-02-24 10:06:24 -08:00
Mitchell Hashimoto
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
Mitchell Hashimoto
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
Mitchell Hashimoto
4e32155b95
Merge pull request #5261 from blairham/revert-4693-master
...
Revert "Rename Windows guest without reboot"
2015-02-24 09:59:53 -08:00
Mitchell Hashimoto
eca5ab0a4d
Merge pull request #5277 from Keeguon/fedora21
...
detect fedora 21
2015-02-24 09:58:20 -08:00
Mitchell Hashimoto
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
Mitchell Hashimoto
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
Mitchell Hashimoto
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
Mitchell Hashimoto
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
Mitchell Hashimoto
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
Mitchell Hashimoto
d399bdae8f
Merge pull request #5320 from epicagency/master
...
providers/virtualbox: support Regexp usage for bridge configuration
2015-02-24 09:43:36 -08:00
Mitchell Hashimoto
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
Mitchell Hashimoto
7900fc65fc
Merge pull request #5349 from agreenbhm/master
...
hosts/windows: update host_info.ps1
2015-02-24 09:26:27 -08:00
gpkfr
c01c4bf41e
remove extra spaces on plugin.rb ;).
2015-02-20 20:49:50 +01:00
gpkfr
1eedc2b5f1
Added specific support for Debian 8 (aka jessie) to permit proper vagrant halt execution
2015-02-20 20:15:05 +01:00
agreenbhm
a1f6bfb1f2
Update host_info.ps1
2015-02-18 11:53:03 -05:00
agreenbhm
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
Shawn Neal
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
Max Lincoln
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
Michael Lopez
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
Michael Lopez
74ffcb27d6
Add 'enable_reporting' attribute for chef provisioner
2015-02-14 22:28:32 +01:00
Timothy Sutton
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
Frank Baalbergen
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
Hugues Lismonde
887f94260e
Support Regexp usage for bridge configuration
2015-02-11 11:07:03 +01:00
Jimmi Dyson
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
Max Lincoln
d6e91483a6
Merge branch 'master' of github.com:mitchellh/vagrant into winrmssl
...
Conflicts:
vagrant.gemspec
2015-02-09 11:10:23 -05:00
Schneider Werner-Walter
02c0bfafc6
Add Scientific Linux to RHEL 7 flavors.
2015-02-08 02:56:44 +02:00
cubetto
2e659bf12c
Update host_machine_build_dir.rb
2015-02-07 20:33:55 -03:00
Christopher Chan-Nui
a6361a750c
Copy linux support for insert_public_key and remove_public_key to solaris11.
2015-02-04 16:58:17 -06:00
Seth Vargo
7d25a687ca
Add tests for sending metadata
2015-02-04 11:45:02 -05:00
Seth Vargo
257ff57772
Remove message for now
2015-02-03 21:06:51 -05:00
Seth Vargo
82b24e9a8f
Pass in a message to the command as well
2015-02-03 19:20:27 -05:00
Seth Vargo
d29a474fbb
Cleanup that syntax
2015-02-03 19:20:12 -05:00
Seth Vargo
edbc3e74d4
Pass metadata to push command
2015-02-03 19:19:51 -05:00
Seth Vargo
52d0df3296
Add --message option to `vagrant push`
2015-02-03 19:19:08 -05:00
Félix Bellanger
b776fe74b8
detect fedora 21
2015-02-03 10:23:35 +01:00
Blair Hamilton
7784ee2d09
Revert "Rename Windows guest without reboot"
2015-01-28 20:00:24 -05:00
Max Lincoln
39882957ee
Add retry_delay setting to speed up test
2015-01-28 13:41:07 -05:00
Max Lincoln
5d5e13bc0f
Change authorization error tests to match WinRM 1.3
2015-01-28 13:41:07 -05:00
Richard Guin
56a6c85e7d
Windows rsync needs to create folders before syncing
2015-01-28 13:07:36 -05:00
Max Lincoln
c37c12526a
Merge branch 'master' of github.com:mitchellh/vagrant into winrm_error_handling
...
Conflicts:
vagrant.gemspec
2015-01-28 10:44:47 -05:00
Shawn Neal
6378deacd6
Merge pull request #5225 from mitchellh/winrm-fs-dependency
...
Use winrm-fs for file uploads
2015-01-26 09:55:31 -08:00
Paul Hinze
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
Max Lincoln
a317a4d50d
Ensure allowed_synced_folder_types is a list of symbols
2015-01-20 16:18:05 -05:00
Max Lincoln
d781dce8f8
Filter synced folders by allowed_synced_folder_types
2015-01-20 16:18:05 -05:00
Max Lincoln
29845e926c
Merge branch 'master' into winrm_error_handling
2015-01-20 16:16:48 -05:00
Max Lincoln
edc867986b
Merge branch 'master' into winrm_error_handling
2015-01-20 16:07:00 -05:00
Max Lincoln
e07f229f6e
Merge branch 'master' of github.com:mitchellh/vagrant into winrmssl
2015-01-20 16:00:20 -05:00
Shawn Neal
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
Seth Vargo
0cfe5ebfa6
Merge pull request #5222 from simonjbeaumont/fix-regex
...
Allow colon in NFS ID regex
2015-01-20 09:58:31 -05:00
Seth Vargo
8519e174f0
Merge pull request #5220 from voxik/fix-permissions
...
Remove unneeded executable permissions.
2015-01-20 09:53:48 -05:00
Si Beaumont
3deed353ae
Allow colon in NFS ID regex
...
Signed-off-by: Si Beaumont <simon.beaumont@citrix.com>
2015-01-20 14:11:42 +00:00
Vít Ondruch
7d3b5352da
Remove unneeded executable permissions.
2015-01-20 11:53:30 +01:00
Clay Allsopp
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
Tomas Srnka
21e2f33fb0
Fix for: [hyperv]: VM import process does not respect Secure Boot option from image #5209
2015-01-17 21:31:37 +01:00
Matt Wrock
87195f8336
use :bridge instead of network_name to align with site docs
2015-01-17 11:39:32 -08:00
Matt Wrock
0b6e65380a
select a switch ased on a network_name
2015-01-17 01:06:56 -08:00
Volodymyr Babchynskyy
a9ac168b19
Added possibility to configure memory, cpus count, and vmname in vagrantfile
2015-01-14 16:59:01 +02:00
Clinton Wolfe
75de0e3dd7
Add insert/remove public key guest capability for solaris (identical to linux)
2015-01-13 21:45:06 -05:00
Clinton Wolfe
17a0d08040
Add chef_install(ed?) guest capability for omnios
2015-01-13 17:45:01 -05:00
Gilles Cornu
cdd5d54208
provisioners/ansible: fix a typo in a comment
...
[ci skip]
2015-01-13 18:52:47 +01:00
Hubert
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
Gilles Cornu
28e0646dc2
Fix typo error in CHANGELOG
...
Close #4860
[ci skip]
2015-01-12 10:59:07 +01:00
Gilles Cornu
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
Gilles Cornu
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
Seth Vargo
114858c7d2
Verify the token is valid when saving
2015-01-09 13:24:53 -05:00
Seth Vargo
253f0637e5
Add a -t command for setting the login token
2015-01-08 17:16:21 -05:00
Dan Carley
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
Seth Vargo
39233e802f
Validate pushes in the global config
2015-01-07 15:51:20 -05:00
Seth Vargo
6b51526ba2
Validate push configuration in the environment
2015-01-07 11:43:26 -05:00
Seth Vargo
e828719c2f
Add logging to vagrant-login
2015-01-07 11:43:14 -05:00
Mitchell Hashimoto
95e1c19f22
provisioners/puppet: fix exception with module paths [GH-5123]
2015-01-06 22:50:24 -08:00
Seth Vargo
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
Mitchell Hashimoto
661657c63f
provisioners/chef: fix failing test
2015-01-06 10:57:25 -08:00
Mitchell Hashimoto
5b4b387f04
provisioners/chef: fix failing tests
2015-01-06 10:56:28 -08:00
Mitchell Hashimoto
de6b55d007
provisioners/puppet: use predictable synced folders
2015-01-06 10:48:31 -08:00
Mitchell Hashimoto
155516fb6c
provisioners/chef: use synced folder cache instead of counter
2015-01-06 10:31:13 -08:00
Mitchell Hashimoto
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
Seth Vargo
7609932a6f
Do not use keyword arguments for string keys
2015-01-05 18:58:57 -05:00
Seth Vargo
d2874064f4
Use .key? instead of .has_key?
2015-01-05 18:29:01 -05:00
Seth Vargo
5e0f91f592
ENV returns nil, not empty strings
2015-01-05 16:04:00 -05:00
Seth Vargo
2bd22c9663
Turn on Atlas debug logging if Vagrant is logging
2015-01-05 15:51:19 -05:00
Chad Maloney
dd62d3c5f1
Merge branch 'master' into GH4201-ShowRSyncOutput
2015-01-05 14:42:08 -06:00
Chad Maloney
d2e1500c74
Review comments applied. Removed changelog. Changed showoutput to verbose.
2015-01-05 14:36:00 -06:00
Mitchell Hashimoto
c4502737c8
Revert "Symbolize and stringify keys in options hash"
...
This reverts commit 1699c92eec
.
2015-01-05 12:35:31 -08:00
Mitchell Hashimoto
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
Mitchell Hashimoto
d482e0ca10
Merge pull request #5085 from evverx/provision-with
...
Enable provision with --provision-with flag
2015-01-05 11:45:10 -08:00
Mitchell Hashimoto
4849ec8f7c
guests/solaris: merge config properly [GH-5092]
2015-01-05 09:52:19 -08:00
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