Commit Graph

6008 Commits

Author SHA1 Message Date
Mitchell Hashimoto 736b6b1674 Update CHANGELOG 2014-05-01 13:49:41 -07:00
Mitchell Hashimoto f6683ad016 website/docs: update slat docs 2014-05-01 13:49:12 -07:00
Mitchell Hashimoto c303f82170 Merge pull request #3603 from eykd/feature/colorize-salt-output
provisioner/salt: Add colorization and log_level support to salt provisioner.
2014-05-01 13:47:44 -07:00
deyk 567af495d4 Add colorization and log_level support to salt provisioner.
This commit adds two new options to the salt provisioner:

- `colorize`: controls color output. Defaults to no-color (present behavior).
- `log_level`: controls log level. Defaults to `debug` (present behavior).

Docs included!
2014-05-01 11:10:09 -07:00
Mitchell Hashimoto 744c9c9663 providers/docker: choose proper provider for host VM 2014-05-01 10:22:43 -07:00
Mitchell Hashimoto 3ef77d395b Update CHANGELOG 2014-05-01 10:19:51 -07:00
Mitchell Hashimoto 049e92056b Merge pull request #3600 from mitchellh/f-default-provider
Default Provider By Priority
2014-05-01 10:19:09 -07:00
Mitchell Hashimoto c5b3dbbf75 core: fix final test 2014-05-01 10:12:36 -07:00
Mitchell Hashimoto 169a829cd8 core: dup the provider options so we can't overwrite them 2014-05-01 10:06:03 -07:00
Mitchell Hashimoto 52bb68ba73 core: Fix some tests, revert a change 2014-05-01 10:03:49 -07:00
Mitchell Hashimoto 76e29b912f providers/docker: lower priority
We do this mostly because Docker is the only provider that using it
requires some amount of Docker-specific knowledge. VirtualBox, VMware,
etc. kind of "just work". It is not the likely case that someone does
a `vagrant up` and expects Docker, at this point.
2014-05-01 09:51:50 -07:00
Mitchell Hashimoto cca9bffa90 core: Can exclude providers 2014-05-01 09:50:35 -07:00
Mitchell Hashimoto ab9f91568e core: more intuitive logic around default providers 2014-05-01 09:46:40 -07:00
Mitchell Hashimoto ba6272cc48 Update tests 2014-05-01 09:41:59 -07:00
Mitchell Hashimoto a9dfb6b3bd core: default provider chosen by usability and prority 2014-05-01 09:40:52 -07:00
Mitchell Hashimoto 429bd73495 core: provider has default priority of 5 2014-05-01 09:26:36 -07:00
Mitchell Hashimoto b6a61d8922 Update CHANGELOG 2014-05-01 09:14:27 -07:00
Mitchell Hashimoto 2362e7d5f0 Merge pull request #3599 from mitchellh/deprecate-warnings-for-unused-halt-config-props
Display deprecation warning for unused halt config properties
2014-05-01 09:09:53 -07:00
Shawn Neal c99a1fb2ae Display deprecation warning for unused halt config properties
halt_timeout and halt_check_interval will be removed in the next version of Vagrant, 1.7.
2014-05-01 09:03:49 -07:00
Mitchell Hashimoto 6524a077e8 Merge pull request #3594 from aspiers/provider-config-doc-typo
website/docs: fix "necessarilly" typo
2014-05-01 08:37:39 -07:00
Mitchell Hashimoto cde90b2432 Merge pull request #3595 from berendt/topy
website: fixed typos found by topy in all Markdown files
2014-05-01 08:31:53 -07:00
Mitchell Hashimoto 9dc2db5e5b Merge pull request #3597 from mitchellh/update-website-docs-halt-timeout-default-value
website/docs: Updated website documentation for graceful_halt_timeout
2014-05-01 08:30:27 -07:00
Mitchell Hashimoto c8652e1067 Merge pull request #3598 from mitchellh/remove-halt-timeout-from-windows-guest
guests/windows: Removed unused halt timeout and check interval settings.
2014-05-01 08:29:50 -07:00
Shawn Neal f4b67df978 Removed unused halt timeout and check interval settings. 2014-05-01 08:00:41 -07:00
Shawn Neal b57131a0ef Updated website documentation for graceful_halt_timeout
The default value in the code is actually 60 seconds, so now the docs match that.
2014-05-01 07:56:09 -07:00
Christian Berendt b05e506031 fixed typos found by topy in all Markdown files
Topy is available at https://github.com/intgr/topy.
2014-05-01 16:22:23 +02:00
Adam Spiers 8a465da594 fix "necessarilly" typo 2014-05-01 10:37:43 +01:00
Mitchell Hashimoto ddc6853a4c website/docs: global-status 2014-05-01 00:11:36 -07:00
Mitchell Hashimoto 97e2af2374 Merge pull request #3593 from mitchellh/elevated-winrm-shell-provisioner
provisioner/shell: Elevated winrm shell provisioner
2014-04-30 23:46:46 -07:00
Shawn Neal cc905d7923 Fix remote/downloaded shell scripts
The temporary shell script that we downloaded the script too was being deleted twice, thus causing an error on the secondary delete.
2014-04-30 19:39:37 -07:00
Shawn Neal 392269a8eb Default the WinRM shell provisioner to privileged (elevated) 2014-04-30 19:35:02 -07:00
Mitchell Hashimoto 490562f00a website/docs: run once and always provisioners 2014-04-30 18:53:24 -07:00
Mitchell Hashimoto 1f2a06710f website/docs: force flags on init and box remove 2014-04-30 18:50:00 -07:00
Mitchell Hashimoto ac57af1b8e website/docs: post_up_message 2014-04-30 18:48:39 -07:00
Mitchell Hashimoto 4a720bd096 website/docs: rdp command 2014-04-30 18:46:23 -07:00
Mitchell Hashimoto 097d4ec2ad website/docs: docker commands 2014-04-30 18:46:22 -07:00
Mitchell Hashimoto e29075c24a website/docs: docker provider 2014-04-30 18:46:21 -07:00
Mitchell Hashimoto cadd7f602c Merge pull request #3592 from mitchellh/reboot-capability-should-fix-symlinks
guests/windows: reboot capability should fix symlinks
2014-04-30 17:46:46 -07:00
Shawn Neal 309f301a16 Added test to verify Windows symlinks to shares are fixed 2014-04-30 17:36:36 -07:00
Shawn Neal 068b5cf0b9 Move Windows symlink re-establishment after reboot into capability
This reduces the complexity and likelihood of provisioner bugs.
2014-04-30 17:36:36 -07:00
Mitchell Hashimoto 9c420b8738 providers/virtualbox: set proper mac address on priv net [GH-3588] 2014-04-30 17:09:29 -07:00
Mitchell Hashimoto 53939d0a47 Update travis, don't need to install custom Bundler 2014-04-30 15:34:47 -07:00
Mitchell Hashimoto ed908a5ed3 Merge pull request #3587 from aspiers/bundler-1.6
add support for bundler >= 1.6.x
2014-04-30 15:34:12 -07:00
Mitchell Hashimoto f80fdfa32a privisoners/salt: proper bootstrap URL [GH-3583] 2014-04-30 15:32:20 -07:00
Adam Spiers 36e924b73e add support for bundler >= 1.6.x
bundler changed their API for Bundler::UI in 1.6.0 via this commit:

  https://github.com/bundler/bundler/commit/5e38e2d7

This caused various issues, e.g.

  https://github.com/mitchellh/vagrant/issues/3451
  https://github.com/test-kitchen/test-kitchen/issues/401

which will hopefully be resolved by teaching vagrant to cope with both
API versions.
2014-04-30 23:32:16 +01:00
Mitchell Hashimoto ac95cb5785 Update README 2014-04-30 10:10:56 -07:00
Mitchell Hashimoto 224ee8003d Merge pull request #3585 from aspiers/backport-3277-old-virtualboxen
backport GH-3277 fix for missing interpolation to older drivers
2014-04-30 09:22:59 -07:00
Mitchell Hashimoto df399d8610 providers/docker: use the proper class 2014-04-30 09:22:02 -07:00
Adam Spiers 082bf37df8 backport GH-3277 fix for missing interpolation to older drivers
The original fix for the "missing interpolation argument :stderr" bug
was in d4b3f226, but it only addressed the driver for VirtualBox 4.3:

  https://github.com/mitchellh/vagrant/issues/3277

This backports the fix to the drivers for VirtualBox 4.0, 4.1, and 4.2.
2014-04-30 16:06:20 +01:00
Mitchell Hashimoto 4381b292f5 Merge pull request #3581 from aspiers/require-ruby-2.x
add dependency on Ruby >= 2.0.0
2014-04-29 17:04:09 -07:00