haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9,240 Commits 8 Branches 143 Tags 51 MiB
Commit Graph

9240 Commits

Author SHA1 Message Date
Karl Isenberg f084fc7d78 Revert 3f9fb2ef03 from GH-2769 
- For compatibility with ba77d4b533

Fixes GH-7073
 2016-05-31 14:52:43 -07:00
Mitchell Hashimoto e2fd0dd792
Up bundler dep 2016-05-31 12:53:39 -07:00
Seth Vargo cf02135290 Merge pull request #7359 from mitchellh/sethvargo/cache_platform 
Cache the results of common operations
 2016-05-31 11:03:46 -04:00
nico.vanelslande 163e1997a6 Make virtualbox vm_exists? more resilient to VirtualBox transient failures. 
We know that the vm does not exist if we get VBOX_E_OBJECT_NOT_FOUND.
For any other error, this may well be VirtualBox getting confused and it is probably
worth retrying...
 2016-05-31 13:23:56 +01:00
Seth Vargo 49ce775b53
Prefix tempfiles with vagrant- 2016-05-31 00:18:16 -04:00
Seth Vargo 97f5ace2f2 Merge pull request #7370 from mitchellh/sethvargo/rm_custom_tempfile 
Remove custom tempfile class
 2016-05-30 23:29:03 -04:00
Seth Vargo 7014aa3bab
Remove custom tempfile class 
This is not actually providing any additional utility and also causes
namespace conflicts with people trying to use the real Tempfile class.
 2016-05-30 23:21:47 -04:00
Seth Vargo f2c769dd4f
Merge branch 'sethvargo/erb_no_sudo' 2016-05-30 21:02:27 -04:00
Seth Vargo 9c5404c9b8
Update CHANGELOG 2016-05-30 21:02:09 -04:00
Seth Vargo 631935d9a2 Merge pull request #7369 from mitchellh/sethvargo/erb_no_sudo 
Remove sudo from generated Vagrantfile
 2016-05-30 21:01:16 -04:00
Seth Vargo 9ca4a8d800
Remove sudo from generated Vagrantfile 
This is unneeded because, by default, provisioners run as a privileged
user.

Fixes GH-7295
 2016-05-30 20:47:13 -04:00
Seth Vargo 2a230a11e2
Cache the results of common operations 
This commit changes Vagrant::Util::Platform to cache the result of some
common operations. These values are highly unlikely to change over the
course of a single Vagrant run and they are only cached for that run.
 2016-05-30 18:27:12 -04:00
Seth Vargo 4c7069d7c9 Merge pull request #7366 from mitchellh/sethvargo/doc_no_parallel 
Document VAGRANT_NO_PARALLEL
 2016-05-30 17:31:48 -04:00
Seth Vargo 0216a09bf2
Document VAGRANT_NO_PARALLEL 
Fixes GH-6014
 2016-05-30 17:28:23 -04:00
Seth Vargo ef2ddcec26
Update CHANGELOG 2016-05-30 17:28:11 -04:00
Seth Vargo 12ad08235e Merge pull request #7365 from mitchellh/sethvargo/docker_fports 
providers/docker: Allow TCP and UDP ports on same number
 2016-05-30 17:27:01 -04:00
Seth Vargo 38f23fe001
providers/docker: Allow TCP and UDP ports on same number 
This commit changes the way ports are aggregated in the Docker provider.
Previously ports were aggregated by their "number", but that is not a
truly unique representation. Instead, the protocol is now taken into
account when generating the port map.

Fixes GH-5527
 2016-05-30 17:23:44 -04:00
Seth Vargo 44ce6a4bc7 Merge pull request #7364 from mitchellh/sethvargo/force_color 
Allow users to force color
 2016-05-30 15:59:52 -04:00
Seth Vargo b95e5d80f5
Allow users to force color 
Fixes GH-5390
 2016-05-30 15:56:09 -04:00
Seth Vargo 4236ddc021
Update CHANGELOG 2016-05-30 15:38:37 -04:00
Seth Vargo 3e3f19a548 Merge pull request #7363 from mitchellh/sethvargo/init_box_version 
Add --box-version to `vagrant init`
 2016-05-30 15:37:18 -04:00
Seth Vargo bba1cbc72f
Add --box-version to `vagrant init` 
This also adds a test suite for that particular command, updates the
documentation, and adds some examples.

Fixes GH-5004
 2016-05-30 15:33:58 -04:00
Seth Vargo f7ffec3589
Update CHANGELOG 2016-05-29 18:48:21 -04:00
Seth Vargo c79594f5d1 Merge pull request #7360 from mitchellh/sethvargo/custom_ssh 
Allow customization of keys_only & paranoid SSH
 2016-05-29 18:47:15 -04:00
Seth Vargo d44fcf2d52
Allow customization of keys_only & paranoid SSH 
This adds two new SSH configuration options:

- `keys_only`
- `paranoid`

These values were previously hard-coded, but can now be user-specified.

Fixes GH-4275
 2016-05-29 18:03:03 -04:00
Seth Vargo 791ad7ac8e
Update CHANGELOG 2016-05-29 14:48:56 -04:00
Seth Vargo 7301ce5de3 Merge pull request #7358 from mitchellh/sethvargo/pr-6620 
Restart container if newer build is available
 2016-05-29 14:47:42 -04:00
Seth Vargo aaef5da41d
Use a different info message when image changed 2016-05-29 14:38:18 -04:00
Luca Invernizzi d8c56be510
Restart docker container if newer image build is available. 2016-05-29 14:38:18 -04:00
Gilles Cornu 8190fba872 provisoners/ansible: improve config test coverage 
Changes:

- Add "config" unit tests for `ansible_local` (guest)
- Share some "config" examples between both ansible provisioners
- Move `config_host.rb` specific examples to `config/host.rb`
- Add a requirement to "../helpers" in `config/guest.rb` in order to be
  able to run the related unit tests

References:

- This is the first part of GH-6633 resolution
- This change is a handy prerequisite for GH-6570

Not addressed yet:

- FIXME (guest.rb): Some test-double stubs are currently not working as
  expected, and the related checks are commented out for the moment
  (no idea why, but this is not urgent to be fixed because of GH-7335
  rejection. See also GH-6984)
- FIXME (shared.rb): The guest-based config should actually NOT return
  an error when the extra_vars file cannot be found, but only display a
  a warning (similarly to the changes done for GH-6763, see 4e451c6)
 2016-05-29 17:01:37 +02:00
Seth Vargo 9b30557716 Merge pull request #7009 from daks/patch-1 
puppet_apply doc: small typo fix
 2016-05-29 01:22:15 -04:00
Seth Vargo 131c8c811e
Update CHANGELOG 2016-05-29 01:20:56 -04:00
Seth Vargo e2fadbcf08
Add a log message when the VM master is missing 2016-05-29 01:19:56 -04:00
Seth Vargo 1e7c8e8d6c
Use LF instead of CRLF 2016-05-29 01:18:24 -04:00
Seth Vargo d3d88f5d91 Merge pull request #7126 from jjulien/iss_6742 
Fixed linked clone failure when master VM is missing
 2016-05-29 01:14:04 -04:00
Seth Vargo 62a407771f
Style 2016-05-29 01:13:13 -04:00
Seth Vargo f03904f4d0 Merge pull request #7179 from c0state/master 
Add section to NFS sync folder docs for non-standard system utility locations
 2016-05-29 01:12:13 -04:00
Seth Vargo 7713a52f01
Update CHANGELOG 2016-05-29 01:11:53 -04:00
Seth Vargo 426b4bf394 Merge pull request #7356 from mitchellh/sethvargo/pr-7228 
Make it clear that you can run commands on machine IDs too
 2016-05-29 01:11:28 -04:00
Seth Vargo 07389ffc04
Update command help to show id too 2016-05-29 01:06:51 -04:00
Kammy ce33b3d114
update cmd format 2016-05-29 01:06:30 -04:00
Seth Vargo 71dad1d7a4
Update CHANGELOG 2016-05-29 00:59:04 -04:00
Seth Vargo 61adbf77d4 Merge pull request #7287 from KierranM/win-ssh-forward 
[#7202] Always forward SSH on Windows
 2016-05-29 00:58:18 -04:00
Seth Vargo 2f3973ef69
Update CHANGELOG 2016-05-29 00:56:47 -04:00
Seth Vargo b11f8cbd1b Merge pull request #7293 from ericpulvino/master 
Set max_network_adapters to 36 for Virtualbox
 2016-05-29 00:55:44 -04:00
Seth Vargo 981b2a807d
Formatting 2016-05-29 00:55:04 -04:00
Seth Vargo 34777fb575 Merge pull request #7308 from davidsiefert/patch-1 
Adding example of using the preserve_order flag
 2016-05-29 00:54:09 -04:00
Seth Vargo d9a9a7dd1b
Update CHANGELOG 2016-05-29 00:47:37 -04:00
Seth Vargo 9a2f6bd63d Merge pull request #7355 from mitchellh/sethvargo/tmpfile 
Identify and cleanup tempfiles and temporary directories
 2016-05-29 00:46:37 -04:00
Seth Vargo 159e1ec1f1
Use a real file for bundler 2016-05-29 00:41:59 -04:00