kitchen-vagrant 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e2f332a407b17162a67ac95a7157b9ca6d3bd55
-  data.tar.gz: 0b6affbcd220e3e7ebf6592dc465c61fc5a986ee
+  metadata.gz: d70f1abd832d8c586a5c1b8f74e41a791df670d6
+  data.tar.gz: b5edfb05ad16864d0019ebf7cff317b635a8b859
 SHA512:
-  metadata.gz: 6c1c7580f8d1676855c911a195de79c1e75cffd4c175059b804b48fba5a347a19b8c2d2828f20dea97ea985c7f98710494239a76d60f659314bde5ee4f4ad244
-  data.tar.gz: f80efdf4c6820d243f77a11bc77d6ad37ef1e4457088c82cf98d5352b8bfef8a6c196a7ddbd91db578986d4eb28fa3ea852ab94007491fc09bda789c16154022
+  metadata.gz: d4abb29d4c5a7755b069e91dcf035623f99beb13244b02d6a04ded560bb8d9b86874690d8e4d3852b0ec2b0fc66e159fb1032036ef9855352c7a9df780d611ac
+  data.tar.gz: 1f2f35168a468324d6c99032ad8d573052eb5e2b0e3be9b0e7f0ea6065e63690987fc44b98a021c330b87a07e8a607b61f3c2be58295fbc1cc841d0b7cf14547

data/.travis.yml

@@ -1,3 +1,24 @@
+language: ruby
+
 rvm:
-  - 1.9.3
+  - 2.2
+  - 2.1
   - 2.0.0
+  - 1.9.3
+  - ruby-head
+
+bundler_args: --without guard
+
+sudo: false
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+
+notifications:
+  irc: "chat.freenode.net#kitchenci"
+
+addons:
+  code_climate:
+    repo_token:
+      secure: "jVI7J+yiQcD5T1YNz9eGReGf6vyp8VIGjsyMEM0HBOxrbk4iCm7P5SN5n5cJPRZNzQd175ceqcpPisvJh91oPMetzpmN+PSDPhOzxVNB4rIqQ8ohJNX2jW/VVpaobzWHAQQurC349gfi2a6l7MvgZw3RGyExkacZXdqr+Bbsc38="

data/CHANGELOG.md

@@ -1,3 +1,38 @@
+## 0.16.0 / 2015-03-23
+
+### Bug fixes
+
+* Pull request [#122][], pull request [#151][]: Only set custom `:box` & `:box_url` values for known Bento boxes. ([@ashb][], [@fnichol][])
+
+### New features
+
+* Pull request $84: Add support for Parallels provider. ([@jhx][])
+* Pull request [#107][]: Add support for libvirt provider. ([@bradleyd][])
+* Pull request [#128][]: Add support for LXC provider. ([@tknerr][])
+* Pull request [#142][]: Add support for managed-servers provider. ([@kbruner][])
+* Add `:gui` configuration attribute to override default GUI mode with VirtualBox and VMware-based providers. ([@fnichol][])
+* Pull request [#137][]: Support SoftLayer `:disk_capacity` configuration. ([@hugespoon][])
+* Pull request [#102][]: Add `:box_version` & `:box_check_update` configuration options to support box versioning. ([@mconigliaro][])
+* Pull request [#129][]: Add `:provision` configuration option. ([@gouketsu][])
+* Pull reqwuest [#112][]: Add configuration option for user Vagrantfiles with `:vagrantfiles` configuration option. ([@byggztryng][])
+* Pull request [#95][]: Add SSH ProxyCommand to state if present. ([@bdclark][])
+* Pull request [#121][]: Add `:ssh` configuration hash. ([@Igorshp][])
+* Pull request [#104][]: Add `:communicator` configuration option to support overriding underlying base box's communicator setting. ([@RobertRehberg][])
+* Pull request [#118][]: Vagrant config password (Not Vagrant recommended). ([@philcallister][])
+
+### Improvements
+
+* Pull request [#148][]: Add full test coverage to the codebase. ([@fnichol][])
+* Pull request [#126][]: Disable vagrant-berkshelf plugin by default (this Driver does not need it and can cause confusing errors). ([@tknerr][])
+* Pull request [#101][]: Qualify VM names with project name. ([@petere][])
+* Pull request [#117][]: Change default hostname to be shorter and friendlier for Windows hosts. ([@Annih][])
+* Pull request [#106][], Use correct URLs to download vagrant in README. ([@alex-slynko-wonga][])
+* Pull request [#146][]: Freshen project quality (TravisCI, Tailor-for-Rubocop, Guard support, etc). ([@fnichol][])
+* Pull request [#147][]: Tidy default configuration attributes. ([@fnichol][])
+* Pull request [#134][]: CHANGELOG Champion, Mr. [@miketheman][]. ([@miketheman][])
+* Pull request [#127][]: README updates. ([@vinyar][], fnichol)
+
+
 ## 0.15.0 / 2014-04-28
 
 ### New features
@@ -164,39 +199,80 @@
 The initial release.
 
 <!--- The following link definition list is generated by PimpMyChangelog --->
-[#7]: https://github.com/opscode/kitchen-vagrant/issues/7
-[#8]: https://github.com/opscode/kitchen-vagrant/issues/8
-[#12]: https://github.com/opscode/kitchen-vagrant/issues/12
-[#15]: https://github.com/opscode/kitchen-vagrant/issues/15
-[#16]: https://github.com/opscode/kitchen-vagrant/issues/16
-[#18]: https://github.com/opscode/kitchen-vagrant/issues/18
-[#19]: https://github.com/opscode/kitchen-vagrant/issues/19
-[#20]: https://github.com/opscode/kitchen-vagrant/issues/20
-[#21]: https://github.com/opscode/kitchen-vagrant/issues/21
-[#24]: https://github.com/opscode/kitchen-vagrant/issues/24
-[#25]: https://github.com/opscode/kitchen-vagrant/issues/25
-[#28]: https://github.com/opscode/kitchen-vagrant/issues/28
-[#29]: https://github.com/opscode/kitchen-vagrant/issues/29
-[#30]: https://github.com/opscode/kitchen-vagrant/issues/30
-[#31]: https://github.com/opscode/kitchen-vagrant/issues/31
-[#34]: https://github.com/opscode/kitchen-vagrant/issues/34
-[#36]: https://github.com/opscode/kitchen-vagrant/issues/36
-[#55]: https://github.com/opscode/kitchen-vagrant/issues/55
-[#56]: https://github.com/opscode/kitchen-vagrant/issues/56
+[#7]: https://github.com/test-kitchen/kitchen-vagrant/issues/7
+[#8]: https://github.com/test-kitchen/kitchen-vagrant/issues/8
+[#12]: https://github.com/test-kitchen/kitchen-vagrant/issues/12
+[#15]: https://github.com/test-kitchen/kitchen-vagrant/issues/15
+[#16]: https://github.com/test-kitchen/kitchen-vagrant/issues/16
+[#18]: https://github.com/test-kitchen/kitchen-vagrant/issues/18
+[#19]: https://github.com/test-kitchen/kitchen-vagrant/issues/19
+[#20]: https://github.com/test-kitchen/kitchen-vagrant/issues/20
+[#21]: https://github.com/test-kitchen/kitchen-vagrant/issues/21
+[#24]: https://github.com/test-kitchen/kitchen-vagrant/issues/24
+[#25]: https://github.com/test-kitchen/kitchen-vagrant/issues/25
+[#28]: https://github.com/test-kitchen/kitchen-vagrant/issues/28
+[#29]: https://github.com/test-kitchen/kitchen-vagrant/issues/29
+[#30]: https://github.com/test-kitchen/kitchen-vagrant/issues/30
+[#31]: https://github.com/test-kitchen/kitchen-vagrant/issues/31
+[#34]: https://github.com/test-kitchen/kitchen-vagrant/issues/34
+[#36]: https://github.com/test-kitchen/kitchen-vagrant/issues/36
+[#55]: https://github.com/test-kitchen/kitchen-vagrant/issues/55
+[#56]: https://github.com/test-kitchen/kitchen-vagrant/issues/56
+[#84]: https://github.com/test-kitchen/kitchen-vagrant/issues/84
+[#95]: https://github.com/test-kitchen/kitchen-vagrant/issues/95
+[#101]: https://github.com/test-kitchen/kitchen-vagrant/issues/101
+[#102]: https://github.com/test-kitchen/kitchen-vagrant/issues/102
+[#104]: https://github.com/test-kitchen/kitchen-vagrant/issues/104
+[#106]: https://github.com/test-kitchen/kitchen-vagrant/issues/106
+[#107]: https://github.com/test-kitchen/kitchen-vagrant/issues/107
+[#112]: https://github.com/test-kitchen/kitchen-vagrant/issues/112
+[#117]: https://github.com/test-kitchen/kitchen-vagrant/issues/117
+[#118]: https://github.com/test-kitchen/kitchen-vagrant/issues/118
+[#121]: https://github.com/test-kitchen/kitchen-vagrant/issues/121
+[#122]: https://github.com/test-kitchen/kitchen-vagrant/issues/122
+[#126]: https://github.com/test-kitchen/kitchen-vagrant/issues/126
+[#127]: https://github.com/test-kitchen/kitchen-vagrant/issues/127
+[#128]: https://github.com/test-kitchen/kitchen-vagrant/issues/128
+[#129]: https://github.com/test-kitchen/kitchen-vagrant/issues/129
+[#134]: https://github.com/test-kitchen/kitchen-vagrant/issues/134
+[#137]: https://github.com/test-kitchen/kitchen-vagrant/issues/137
+[#142]: https://github.com/test-kitchen/kitchen-vagrant/issues/142
+[#146]: https://github.com/test-kitchen/kitchen-vagrant/issues/146
+[#147]: https://github.com/test-kitchen/kitchen-vagrant/issues/147
+[#148]: https://github.com/test-kitchen/kitchen-vagrant/issues/148
+[#151]: https://github.com/test-kitchen/kitchen-vagrant/issues/151
+[@Annih]: https://github.com/Annih
+[@Igorshp]: https://github.com/Igorshp
+[@RobertRehberg]: https://github.com/RobertRehberg
 [@TheDude05]: https://github.com/TheDude05
 [@albertsj1]: https://github.com/albertsj1
+[@alex-slynko-wonga]: https://github.com/alex-slynko-wonga
 [@antonio-osorio]: https://github.com/antonio-osorio
 [@arangamani]: https://github.com/arangamani
+[@ashb]: https://github.com/ashb
+[@bdclark]: https://github.com/bdclark
+[@bradleyd]: https://github.com/bradleyd
+[@byggztryng]: https://github.com/byggztryng
 [@dje]: https://github.com/dje
 [@fnichol]: https://github.com/fnichol
 [@fujin]: https://github.com/fujin
 [@gildegoma]: https://github.com/gildegoma
+[@gouketsu]: https://github.com/gouketsu
+[@hugespoon]: https://github.com/hugespoon
+[@jhx]: https://github.com/jhx
 [@josephholsten]: https://github.com/josephholsten
+[@kbruner]: https://github.com/kbruner
 [@keiths-osc]: https://github.com/keiths-osc
 [@manul]: https://github.com/manul
 [@martinisoft]: https://github.com/martinisoft
 [@mattray]: https://github.com/mattray
+[@mconigliaro]: https://github.com/mconigliaro
+[@miketheman]: https://github.com/miketheman
 [@petejkim]: https://github.com/petejkim
+[@petere]: https://github.com/petere
+[@philcallister]: https://github.com/philcallister
 [@sandfish8]: https://github.com/sandfish8
 [@sethvargo]: https://github.com/sethvargo
+[@tknerr]: https://github.com/tknerr
 [@tmatilai]: https://github.com/tmatilai
+[@vinyar]: https://github.com/vinyar

data/Gemfile

@@ -1,8 +1,11 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in kitchen-vagrant.gemspec
+source "https://rubygems.org"
 gemspec
 
+group :guard do
+  gem "guard-rspec",    :require => nil
+  gem "guard-rubocop",  :require => nil
+end
+
 group :test do
-  gem 'rake'
+  gem "codeclimate-test-reporter", :require => nil
 end

data/Guardfile

@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+ignore %r{^\.gem/}
+
+def rspec_opts
+  { :cmd => "bundle exec rspec" }
+end
+
+def rubocop_opts
+  { :all_on_start => false, :keep_failed => false, :cli => "-r finstyle" }
+end
+
+group :red_green_refactor, :halt_on_fail => true do
+  guard :rspec, rspec_opts do
+    watch(%r{^spec/(.*)_spec\.rb})
+    watch(%r{^lib/(.*)([^/]+)\.rb})   { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+    watch(%r{^spec/spec_helper\.rb})  { "spec" }
+  end
+
+  guard :rubocop, rubocop_opts do
+    watch(%r{.+\.rb$})
+    watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
+  end
+end

data/README.md

@@ -1,7 +1,9 @@
 # <a name="title"></a> Kitchen::Vagrant
 
-[![Build Status](https://travis-ci.org/test-kitchen/kitchen-vagrant.png)](https://travis-ci.org/test-kitchen/kitchen-vagrant)
-[![Code Climate](https://codeclimate.com/github/test-kitchen/kitchen-vagrant.png)](https://codeclimate.com/github/test-kitchen/kitchen-vagrant)
+[![Gem Version](https://badge.fury.io/rb/kitchen-vagrant.svg)](http://badge.fury.io/rb/kitchen-vagrant)
+[![Build Status](https://secure.travis-ci.org/test-kitchen/kitchen-vagrant.svg?branch=master)](https://travis-ci.org/test-kitchen/kitchen-vagrant)
+[![Code Climate](https://codeclimate.com/github/test-kitchen/kitchen-vagrant.svg)](https://codeclimate.com/github/test-kitchen/kitchen-vagrant)
+[![Test Coverage](https://codeclimate.com/github/test-kitchen/kitchen-vagrant/coverage.svg)](https://codeclimate.com/github/test-kitchen/kitchen-vagrant)
 
 A Test Kitchen Driver for Vagrant.
 
@@ -51,39 +53,66 @@ Please read the [Driver usage][driver_usage] page for more details.
 ## <a name="default-config"></a> Default Configuration
 
 This driver can predict the Vagrant box name and download URL for a select
-number of platforms (VirtualBox provider only) that have been published by
-Opscode, such as:
+number of platforms (VirtualBox and VMware providers only) that have been published by
+Chef Software Inc, in the [Bento][bento] project such as:
 
-```ruby
+```yaml
 ---
 platforms:
-- name: ubuntu-10.04
-- name: ubuntu-12.04
-- name: ubuntu-12.10
-- name: ubuntu-13.04
-- name: centos-5.9
-- name: centos-6.4
-- name: debian-7.1.0
+  - name: ubuntu-10.04
+  - name: ubuntu-12.04
+  - name: ubuntu-14.04
+  - name: ubuntu-13.04
+  - name: centos-5.11
+  - name: centos-6.6
+  - name: debian-7.8
+  - name: freebsd-10.1
 ```
 
 This will effectively generate a configuration similar to:
 
-```ruby
+```yaml
+---
+platforms:
+  - name: ubuntu-10.04
+    driver:
+      box: opscode-ubuntu-10.04
+      box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-10.04_chef-provisionerless.box
+  - name: ubuntu-12.04
+    driver:
+      box: opscode-ubuntu-12.04
+      box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.04_chef-provisionerless.box
+  - name: ubuntu-14.04
+    driver:
+      box: opscode-ubuntu-14.04
+      box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.04_chef-provisionerless.box
+  # ...
+```
+
+Any other platform names will set a more reasonable default for `box` and leave `box_url` unset. For example:
+
+```yaml
+---
+platforms:
+  - name: slackware-14.1
+  - name: openbsd-5.6
+  - name: windows-2012r2
+```
+
+This will effectively generate a configuration similar to:
+
+```yaml
 ---
 platforms:
-- name: ubuntu-10.04
-  driver:
-    box: opscode-ubuntu-10.04
-    box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_provisionerless.box
-- name: ubuntu-12.04
-  driver:
-    box: opscode-ubuntu-12.04
-    box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_provisionerless.box
-- name: ubuntu-12.10
-  driver:
-    box: opscode-ubuntu-12.10
-    box_url: ...
-# ...
+  - name: slackware-14.1
+    driver:
+      box: slackware-14.1
+  - name: openbsd-5.6
+    driver:
+      box: openbsd-5.6
+  - name: windows-2012r2
+    driver:
+      box: windows-2012r2
 ```
 
 Many host wide defaults for Vagrant can be set using `$HOME/.vagrant.d/Vagrantfile`. See the [Vagrantfile documentation][vagrantfile] for more information.
@@ -96,28 +125,56 @@ Many host wide defaults for Vagrant can be set using `$HOME/.vagrant.d/Vagrantfi
 details, please read the Vagrant [machine settings][vagrant_machine_settings]
 page.
 
-The default will be computed from the platform name of the instance. For
-example, a platform called "fuzzypants-9.000" will produce a default `box`
-value of `"opscode-fuzzypants-9.000"`.
+The default will be computed from the platform name of the instance. Howver, for a small number of common/known platforms in the [Bento][bento] project, the default will prepend `"opscode-"` to the start to match the downloadable `box_url` (see below).
+
+For example, a platform with a Bento box called "ubuntu-14.04" will produce a
+default `box` value of `"opscode-ubuntu-14.04"`. Alternatively, a box called
+`"slackware-14.1"` will produce a default `box` value of `"slackware-14.1".
+
+### <a name="config-box-check-update"></a> box\_check\_update
+
+Whether to check for box updates (disabled by default).
 
 ### <a name="config-box-url"></a> box\_url
 
-The URL that the configured box can be found at. If the box is not installed on
-the system, it will be retrieved from this URL when the virtual machine is
-started.
+A default URL will be computed only for a small number of common/known
+platforms in the [Bento][bento] project. Additionally, a URL will only be
+computed if the Vagrant provider is VirtualBox or is VMware based (these are
+the only providers with downloadable base boxes).
 
-The default will be computed from the platform name of the instance.
+### <a name="config-box-version"></a> box\_version
 
-### <a name="config-provider"></a> provider
+The [version][vagrant_versioning] of the configured box.
 
-This determines which Vagrant provider to use. The value should match
-the provider name in Vagrant. For example, to use VMware Fusion the provider
-should be `vmware_fusion`. Please see the docs on [providers][vagrant_providers]
-for further details.
+The default is `nil`, indicating unset.
 
-By default the value is unset, or `nil`. In this case the driver will use the
-Vagrant [default provider][vagrant_default_provider] which at this current time
-is `virtualbox` unless set by `VAGRANT_DEFAULT_PROVIDER` environment variable.
+### <a name="config-communicator"></a> communicator
+
+**Note:** It should largely be the responsibility of the underlying Vagrant
+base box to properly set the `config.vm.communicator` value. For example, if
+the base box is a Windows operating system and does not have an SSH service
+installed and enabled, then Vagrant will be unable to even boot it (using
+`vagrant up`), without a custom Vagrantfile. If you are authoring a base box,
+please take care to set your value for communicator to give your users the best
+possible out-of-the-box experience.
+
+For overriding the default communicator setting of the base box.
+
+For example:
+
+```yaml
+---
+driver:
+  communicator: ssh
+```
+
+will generate a Vagrantfile configuration similar to:
+
+```ruby
+  config.vm.communicator = "ssh"
+```
+
+The default is `nil` assuming ssh will be used.
 
 ### <a name="config-customize"></a> customize
 
@@ -125,7 +182,8 @@ A **Hash** of customizations to a Vagrant virtual machine.  Each key/value
 pair will be passed to your providers customization block. For example, with
 the default `virtualbox` provider:
 
-```ruby
+```yaml
+---
 driver:
   customize:
     memory: 1024
@@ -145,23 +203,49 @@ Vagrant.configure("2") do |config|
 end
 ```
 
-Please read the "Customizations" sections for [VirtualBox][vagrant_config_vbox] and [VMware][vagrant_config_vmware] for more details.
+Please read the "Customizations" sections for [VirtualBox][vagrant_config_vbox]
+and [VMware][vagrant_config_vmware] for more details.
+
+### <a name="config-guest"></a> guest
 
-### <a name="config-dry-run"></a> dry\_run
+**Note:** It should largely be the responsibility of the underlying Vagrant
+base box to properly set the `config.vm.guest` value. For example, if the base
+box is a Windows operating system, then Vagrant will be unable to even boot it
+(using `vagrant up`), without a custom Vagrantfile. If you are authoring a base
+box, please take care to set your value for communicator to give your users the
+best possible out-of-the-box experience.
 
-Useful when debugging Vagrant CLI commands. If set to `true`, all Vagrant CLI
-commands will be displayed rather than executed.
+For overriding the default guest setting of the base box.
 
 The default is unset, or `nil`.
 
-### <a name="config-guest"></a> guest
+### <a name="config-gui"></a> gui
 
-Set the `config.vm.guest` setting in the default Vagrantfile. For more details
-please read the
-[config.vm.guest](http://docs.vagrantup.com/v2/vagrantfile/machine_settings.html)
-section of the Vagrant documentation.
+Allows GUI mode for each defined platform. Default is **nil**. Value is passed
+to the `config.vm.provider` but only for the VirtualBox and VMware-based
+providers.
 
-The default is unset, or `nil`.
+```yaml
+---
+platforms:
+  - name: ubuntu-14.04
+    driver:
+      gui: true
+```
+
+will generate a Vagrantfile configuration similar to:
+
+```ruby
+Vagrant.configure("2") do |config|
+  # ...
+
+  c.vm.provider :virtualbox do |p|
+    p.gui = true
+  end
+end
+```
+
+For more info about GUI vs. Headless mode please see [vagrant configuration docs][vagrant_config_vbox]
 
 ### <a name="config-network"></a> network
 
@@ -169,11 +253,12 @@ An **Array** of network customizations for the virtual machine. Each Array
 element is itself an Array of arguments to be passed to the `config.vm.network`
 method. For example:
 
-```ruby
+```yaml
+---
 driver:
   network:
-  - ["forwarded_port", {guest: 80, host: 8080}]
-  - ["private_network", {ip: "192.168.33.33"}]
+    - ["forwarded_port", {guest: 80, host: 8080}]
+    - ["private_network", {ip: "192.168.33.33"}]
 ```
 
 will generate a Vagrantfile configuration similar to:
@@ -206,12 +291,42 @@ or the `kitchen_root`.
 For example, if your project requires
 [Bindler](https://github.com/fgrehm/bindler), this command could be:
 
-```
-pre_create_command: cp .vagrant_plugins.json {{vagrant_root}}/ && vagrant plugin bundle
+```yaml
+---
+driver
+  pre_create_command: cp .vagrant_plugins.json {{vagrant_root}}/ && vagrant plugin bundle
 ```
 
 The default is unset, or `nil`.
 
+### <a name="config-provider"></a> provider
+
+This determines which Vagrant provider to use. The value should match
+the provider name in Vagrant. For example, to use VMware Fusion the provider
+should be `vmware_fusion`. Please see the docs on [providers][vagrant_providers]
+for further details.
+
+By default the value is unset, or `nil`. In this case the driver will use the
+Vagrant [default provider][vagrant_default_provider] which at this current time
+is `virtualbox` unless set by `VAGRANT_DEFAULT_PROVIDER` environment variable.
+
+### <a name="provision"></a> provision
+
+Set to true if you want to do the provision of vagrant in create.
+Useful in case of you want to customize the OS in provision phase of vagrant
+
+### <a name="config-ssh-key"></a> ssh\_key
+
+This is the path to the private key file used for SSH authentication if you
+would like to use your own private ssh key instead of the default vagrant
+insecure private key.
+
+If this value is a relative path, then it will be expanded relative to the
+location of the main Vagrantfile. If this value is nil, then the default
+insecure private key that ships with Vagrant will be used.
+
+The default value is unset, or `nil`.
+
 ### <a name="config-synced-folders"></a> synced_folders
 
 Allow the user to specify a collection of synced folders on each Vagrant
@@ -219,10 +334,11 @@ instance. Source paths can be relative to the kitchen root.
 
 The default is an empty Array, or `[]`. The example:
 
-```ruby
+```yaml
+---
 driver:
-  synced_folders: 
-    - ["data/%{instance_name}", "/opt/instance_data"],
+  synced_folders:
+    - ["data/%{instance_name}", "/opt/instance_data"]
     - ["/host_path", "/vm_path", "create: true, type: :nfs"]
 ```
 
@@ -237,14 +353,6 @@ Vagrant.configure("2") do |config|
 end
 ```
 
-### <a name="config-username"></a> username
-
-This is the username used for SSH authentication if you
-would like to connect with a different account than Vagrant default user.
-
-If this value is nil, then Vagrant parameter `config.ssh.default.username`
-will be used (which is usually set to 'vagrant').
-
 ### <a name="config-vagrantfile-erb"></a> vagrantfile\_erb
 
 An alternate Vagrantfile ERB template that will be rendered for use by this
@@ -260,6 +368,22 @@ road--be aware.
 
 The default is to use a template which ships with this gem.
 
+### <a name="config-vagrantfiles"></a> vagrantfiles
+
+An array of paths to other Vagrantfiles to be merged with the default one. The
+paths can be absolute or relative to the .kitchen.yml file.
+
+**Note:** the Vagrantfiles must have a .rb extension to satisfy Ruby's
+Kernel#require.
+
+```yaml
+---
+driver:
+  vagrantfiles:
+    - VagrantfileA.rb
+    - /tmp/VagrantfileB.rb
+```
+
 ### <a name="config-vm-hostname"></a> vm\_hostname
 
 Sets the internal hostname for the instance. This is not used when connecting
@@ -276,18 +400,6 @@ The default will be computed from the name of the instance. For
 example, the instance was called "default-fuzz-9" will produce a default
 `vm_hostname` value of `"default-fuzz-9.vagrantup.com"`.
 
-### <a name="config-ssh-key"></a> ssh\_key
-
-This is the path to the private key file used for SSH authentication if you
-would like to use your own private ssh key instead of the default vagrant
-insecure private key.
-
-If this value is a relative path, then it will be expanded relative to the
-location of the main Vagrantfile. If this value is nil, then the default
-insecure private key that ships with Vagrant will be used.
-
-The default value is unset, or `nil`.
-
 ## <a name="development"></a> Development
 
 * Source hosted at [GitHub][repo]
@@ -318,7 +430,8 @@ Apache 2.0 (see [LICENSE][license])
 [repo]:             https://github.com/opscode/kitchen-vagrant
 [driver_usage]:     http://kitchen.ci/docs/getting-started/adding-platform
 
-[vagrant_dl]:               http://downloads.vagrantup.com/
+[bento]:                    https://github.com/chef/bento
+[vagrant_dl]:               http://www.vagrantup.com/downloads.html
 [vagrant_machine_settings]: http://docs.vagrantup.com/v2/vagrantfile/machine_settings.html
 [vagrant_networking]:       http://docs.vagrantup.com/v2/networking/basic_usage.html
 [virtualbox_dl]:            https://www.virtualbox.org/wiki/Downloads
@@ -327,6 +440,7 @@ Apache 2.0 (see [LICENSE][license])
 [vagrant_config_vbox]:      http://docs.vagrantup.com/v2/virtualbox/configuration.html
 [vagrant_config_vmware]:    http://docs.vagrantup.com/v2/vmware/configuration.html
 [vagrant_providers]:        http://docs.vagrantup.com/v2/providers/index.html
+[vagrant_versioning]:       https://docs.vagrantup.com/v2/boxes/versioning.html
 [vagrant_wrapper]:          https://github.com/org-binbab/gem-vagrant-wrapper
 [vagrant_wrapper_background]: https://github.com/org-binbab/gem-vagrant-wrapper#background---aka-the-vagrant-gem-enigma
 [vmware_plugin]:            http://www.vagrantup.com/vmware