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
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
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
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
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
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
abb9e5478a
provisioners/docker: get GPG key via SSL [GH-4597]
2014-10-23 09:34:24 -07:00
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
a6c0989bc6
Revert "Merge pull request #4616 from crypt1d/master"
...
This reverts commit aec69c462788754d2904
2014-10-23 09:30:46 -07:00
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
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
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
4a9d99ef71
Merge pull request #4641 from dimbleby/smb_share_error
...
Provide output on raising LinuxMountFailed
2014-10-23 09:18:20 -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
2a8f74f54a
providers/virtualbox: style
2014-10-23 09:12:41 -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
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
44310872f6
Merge pull request #4693 from uchagani/master
...
guest/windows: Rename Windows guest without reboot
2014-10-23 09:06:55 -07:00
15f16181f5
communicators/ssh: clear out some comments
2014-10-23 09:06:28 -07:00
Mitchell Hashimoto
Seth Vargo
Max Lincoln
Peter Ericson
Mitchell Hashimoto
Michael Dwyer
Gilles Cornu
Atha Kouroussis
Jeff Quast
Ken Crowell
Paul Hinze
Daniel Klockenkämper
Chris Jones
Teemu Matilainen
Adam Spiers
Tarrant