kitchen-ec2 0.10.0 → 1.0.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7d28f5952b83630a3d5da24788ff269318ddb78
-  data.tar.gz: ad437ab4aee9027473f8ce896f1816cc49fd334f
+  metadata.gz: 1de9e6f3ad8a3af4870ff7a4766a1be72d9c0b31
+  data.tar.gz: 2776133704a238453b242c99bc3390295f522f98
 SHA512:
-  metadata.gz: 555b1c421bfbb295e47ea4bd37ce152e43c0524395a47bcedd0f7c6ca184c377d6fea0004dcd641ad7a714f9f0fc39923fb8c6fefbeff06481e71e1d5ffe3ca4
-  data.tar.gz: 8b4ba45abccbcc9a499e2603f055ad6447a04dab4ff9f72a0c5acb1f4c1a4520d4a0ba60fedb29eb6dd81cb55016e800df9ed13db6784ff2df2e8f2d06960d1f
+  metadata.gz: 19a1e7124975185de7cb7b94be6852db2fd3e2381d6214f86229c2eb55d0e4d6d20d67ac1363c7fa357393e1753dd412583f8487ebe12566ed1def4433f2434a
+  data.tar.gz: a4bcc544a26388e68db518e418d93da07bde5675d7a56aab389197e2fd6dcd6c58bc4921a9383997c93c94a6947d1e33e6b6ae2f70205dbca2195765feb6535f

data/.gitignore

@@ -7,6 +7,7 @@ Gemfile.lock
 InstalledFiles
 _yardoc
 coverage
+bin/
 doc/
 lib/bundler/man
 pkg
@@ -17,3 +18,5 @@ test/version_tmp
 tmp
 .project
 
+.kitchen/
+.kitchen.local.yml

data/.travis.yml

@@ -1,3 +1,7 @@
 language: ruby
+cache: bundler
+sudo: false
 rvm:
-  - 1.9.3
+  - 2.0.0
+  - 2.1
+  - 2.2

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-## 0.10.0 / 2016-06-24
+## 0.10.0 / 2015-06-24
 
 ### Bug Fixes
 

data/Gemfile

@@ -1,7 +1,10 @@
 source "https://rubygems.org"
 
-# Specify your gem's dependencies in kitchen-ec2.gemspec
+# Specify your gem"s dependencies in kitchen-ec2.gemspec
 gemspec
+gem "test-kitchen"
+gem "winrm-transport"
+gem "winrm-fs"
 
 group :test do
   gem "rake"

data/README.md

@@ -1,95 +1,160 @@
 # <a name="title"></a> Kitchen::Ec2: A Test Kitchen Driver for Amazon EC2
 
-[![Gem Version](https://badge.fury.io/rb/kitchen-ec2.png)](http://badge.fury.io/rb/kitchen-ec2)
-[![Build Status](https://travis-ci.org/test-kitchen/kitchen-ec2.png)](https://travis-ci.org/test-kitchen/kitchen-ec2)
-[![Code Climate](https://codeclimate.com/github/test-kitchen/kitchen-ec2.png)](https://codeclimate.com/github/test-kitchen/kitchen-ec2)
+[![Gem Version](https://badge.fury.io/rb/kitchen-ec2.svg)](https://badge.fury.io/rb/kitchen-ec2)
+[![Build Status](https://travis-ci.org/test-kitchen/kitchen-ec2.svg?branch=master)](https://travis-ci.org/test-kitchen/kitchen-ec2)
+[![Code Climate](https://codeclimate.com/github/test-kitchen/kitchen-ec2/badges/gpa.svg)](https://codeclimate.com/github/test-kitchen/kitchen-ec2)
 
 A [Test Kitchen][kitchenci] Driver for Amazon EC2.
 
 This driver uses the [aws sdk gem][aws_sdk_gem] to provision and destroy EC2
 instances. Use Amazon's cloud for your infrastructure testing!
 
+## Initial Setup
+
+To get started, you need to install the software and set up your credentials and SSH key. Some of these steps you have probably already done, but we include them here for completeness.
+
+1. Install the latest test-kitchen or ChefDK and put it in your path.
+2. From this repository, type `bundle install; bundle exec rake install` to install the latest version of the driver.
+3. Install the [AWS command line tools](http://docs.aws.amazon.com/cli/latest/userguide/cli-chap-getting-set-up.html).
+4. Run `aws configure` to place your AWS credentials on the drive at ~/.aws/credentials.
+5. Create your AWS SSH key. We recommend naming it with your username, but you can use any name:
+
+     ```
+     aws ec2 create-key-pair --key-name $USER | ruby -e "require 'json'; puts JSON.parse(STDIN.read)['KeyMaterial']" > ~/.ssh/$USER
+     ```
+6. `export AWS_SSH_KEY_ID=<your key name>`
+
+## Quick Start
+
+Once
+that is done, create your kitchen file in your cookbook directory (or an empty
+directory if you just want to get a feel for it):
+
+1. `kitchen init -D ec2`
+2. Edit `.kitchen.yml` and add the aws_ssh_key_id to driver and a transport with
+   an ssh_key:
+
+   ```yaml
+   transport:
+     ssh_key: ~/.ssh/your_private_key_file
+   ```
+3. While you are in there, modify `centos-7.1` to `centos-7`.
+3. `kitchen test`
+
+It's that easy! This will set up and run centos and ubuntu flavored instances.
+
 ## Requirements
 
 There are **no** external system requirements for this driver. However you
 will need access to an [AWS][aws_site] account.  [IAM][iam_site] users should have, at a minimum, permission to manage the lifecycle of an EC2 instance along with modifying components specified in kitchen driver configs.  Consider using a permissive managed IAM policy like ``arn:aws:iam::aws:policy/AmazonEC2FullAccess`` or tailor one specific to your security requirements.
 
-## Installation and Setup
+## Configuration
 
-Please read the [Driver usage][driver_usage] page for more details.
+By automatically applying reasonable defaults wherever possible, kitchen-ec2 does a lot of work to make your life easier. Here is a description of some of the configuration parameters and what we do to default them.
 
-## Default Configuration
+### Specifying the Image
 
-This driver can determine AMI and username login for a select number of
-platforms in each region.
+There are three ways to specify the image you use for the instance: `image_id`,
+`image_search` and `platform.name`
 
-For Windows instances the generated Administrator password is fetched
-automatically from Amazon EC2 with the same private key as we use for
-SSH logins to Linux.
+#### `image_id`
 
-Currently, the following platform names are supported:
+`image_id` can be set explicitly. It must be an ami in the region you are
+working with!
 
-```ruby
----
+```yaml
+platforms:
+  - name: centos-7
+    image_id: ami-96a818fe
+```
+
+image_id's have a format like ami-748e2903. The image_id values appear next to the image names when you select 'Launch Instance' from the AWS EC2 console. You can also see the list from the AWS CLI ````aws ec2 describe-images````.
+
+#### `image_search`
+
+`image_search` lets you specify a series of key/value pairs to search for the
+image. If a value is set to an array, then *any* of those values will match.
+You can learn more about the available filters in the AWS CLI doc under `--filters` [here](http://docs.aws.amazon.com/cli/latest/reference/ec2/describe-images.html).
+
+```yaml
 platforms:
-  - name: ubuntu-10.04
-  - name: ubuntu-12.04
-  - name: ubuntu-12.10
-  - name: ubuntu-13.04
-  - name: ubuntu-13.10
   - name: ubuntu-14.04
-  - name: centos-6.4
-  - name: debian-7.1.0
-  - name: windows-2012r2
-  - name: windows-2008r2
+    image_search:
+      owner-id: "099720109477"
+      name: ubuntu/images/*/ubuntu-*-14.04*
 ```
 
-This will effectively generate a configuration similar to:
+In the event that there are multiple matches (as sometimes happens), we sort to
+get the best results. In order of priority from greatest to least, we prefer:
 
-```ruby
----
+- HVM images over paravirtual
+- SSD support over magnetic drives
+- 64-bit over 32-bit
+- The most recently created image (to pick up patch releases)
+
+#### `platform.name`
+
+The third way to specify the image is by leaving `image_id` and `image_search`
+blank, and specifying a standard platform name.
+
+```yaml
 platforms:
-  - name: ubuntu-10.04
-    driver:
-      image_id: ami-1ab3ce73
-    transport:
-      username: ubuntu
-  # ...
-  - name: centos-6.4
-    driver:
-      image_id: ami-bf5021d6
-    transport:
-      username: root
-  # ...
+  - name: ubuntu-14.04
+```
+
+If you use the platform name `ubuntu`, `windows`, `rhel`, `debian`, `centos`, `freebsd` or `fedora`, kitchen-ec2 will search for the latest matching official image of
+the given OS in your region. You may leave versions off, specify partial versions,
+and you may specify architecture to distinguish 32- and 64-bit. Some examples:
+
+```yaml
+platforms:
+  # The latest stable minor+patch release of rhel 6
+  - name: rhel-6
+  # The latest patch release of CentOS 6.3
+  - name: centos-6.3
+  # 32-bit version of latest major+minor+patch release of Ubuntu
+  - name: ubuntu-i386
+  # 32-bit version of Debian 6
+  - name: debian-6-i386
+  # Latest 32-bit stable minor release of freebsd 10
+  - name: freebsd-10-i386
+  # The latest stable major+minor+patch release of Fedora
+  - name: fedora
+  # The most recent service-pack for Windows 2012 (not R2)
+  - name: windows-2012
+  # The most recent service-pack for Windows 2012R2
   - name: windows-2012r2
-    driver:
-      image_id: ami-28bc7428
-    transport:
-      username: administrator
-  # ...
+  # Windows 2008 RTM (not R2, no service pack)
+  - name: windows-2008rtm
+  # Windows 2008R2 SP1
+  - name: windows-2008r2sp1
 ```
 
-For specific default values, please consult [amis.json][amis_json].
+We always pick the highest released stable version that matches your regex, and
+follow the other `image_search` rules for preference.
 
-## Authenticating with AWS
+### AWS Authentication
 
-There are 3 ways you can authenticate against AWS, and we will try them in the
+In order to connect to AWS, you must specify the AWS access key id and secret key
+for your account. There are 3 ways you do this, and we will try them in the
 following order:
 
 1. You can specify the access key and access secret (and optionally the session
-token) through config.  See the `aws_access_key_id` and `aws_secret_access_key`
-config sections below to see how to specify these in your .kitchen.yml or
-through environment variables.  If you would like to specify your session token
-use the environment variable `AWS_SESSION_TOKEN`.
-1. The shared credentials ini file at `~/.aws/credentials`.  You can specify 
-multiple profiles in this file and select one with the `AWS_PROFILE`
-environment variable or the `shared_credentials_profile` driver config.  Read
-[this][credentials_docs] for more information.
-1. From an instance profile when running on EC2.  This accesses the local
-metadata service to discover the local instance's IAM instance profile.
+   token) through config.  See the `aws_access_key_id` and `aws_secret_access_key`
+   config sections below to see how to specify these in your .kitchen.yml or
+   through environment variables.  If you would like to specify your session token
+   use the environment variable `AWS_SESSION_TOKEN`.
+2. The shared credentials ini file at `~/.aws/credentials`. This is the file
+   populated by `aws configure` command line and used by AWS tools in general, so if
+   you are set up for any other AWS tools, you probably already have this. You can
+   specify multiple profiles in this file and select one with the `AWS_PROFILE`
+   environment variable or the `shared_credentials_profile` driver config.  Read
+   [this][credentials_docs] for more information.
+3. From an instance profile when running on EC2.  This accesses the local
+   metadata service to discover the local instance's IAM instance profile.
 
 This precedence order is taken from http://docs.aws.amazon.com/sdkforruby/api/index.html#Configuration
-  
+
 The first method attempted that works will be used.  IE, if you want to auth
 using the instance profile, you must not set any of the access key configs
 or environment variables, and you must not specify a `~/.aws/credentials`
@@ -97,115 +162,110 @@ file.
 
 Because the Test Kitchen test should be checked into source control and ran
 through CI we no longer recommend storing the AWS credentials in the
-`.kitchen.yml` file.  Instead, specify them as environment variables or in the 
+`.kitchen.yml` file.  Instead, specify them as environment variables or in the
 `~/.aws/credentials` file.
 
-## Windows Configuration
+### Instance Login Configuration
 
-If you specify a platform name of `windows-2012r2` or `windows-2008` Test
-Kitchen will pull a default AMI out of `amis.json` if one is not specified.
+The instances you create use credentials you specify which are *separate* from
+the AWS credentials. Generally, SSH and WinRM use an AWS key pair which you
+specify. You probably set this up in the Initial Setup.
 
-The default user_data will add any `username` with its associated `password`
-from the transport options to the Aministrator group.  If no `username` is
-specified then the default `administrator` is available.
-
-AWS automatically generates an `administrator` password in the default
-Windows AMIs.  Test Kitchen fetches this and stores it in the
-`.kitchen/#{platform}.json` file.  If you need to `kitchen login` to the instance
-and you have not specified your own `username` and `password` you can use
-the `administrator` user and the password from this file.  Unfortunately
-we cannot auto-fill the RDP password at this point.
+#### `aws_ssh_key_id`
 
-## General Configuration
+The ID of the AWS key pair you want to use.
 
-### availability\_zone
+The default will be read from the `AWS_SSH_KEY_ID` environment variable if set,
+or `nil` otherwise.
 
-The AWS [availability zone][region_docs] to use.  Only request
-the letter designation - will attach this to the region used.
+This must be one of the KeyName values shown by the AWS CLI: `aws ec2 describe-key-pairs`
 
-The default is `"#{region}b"`.
+#### `transport.ssh_key`
 
-### aws\_access\_key\_id
+The private key file for the AWS key pair you want to use.
 
-**Deprecated** It is recommended to use the `AWS_ACCESS_KEY_ID` or the
-`~/.aws/credentials` file instead.
+#### `transport.username`
 
-The AWS [access key id][credentials_docs] to use.
+This is not strictly a `driver` thing, but the username is a crucial component
+of logging in to an instance. Different AMIs tend to provide different usernames.
 
-### aws\_secret\_access\_key
+If you use an official AMI (or create an image with the platform name in the
+image name), we will use the default username for official AMIs for that platform.
 
-**Deprecated** It is recommended to use the `AWS_SECRET_ACCESS_KEY` or the
-`~/.aws/credentials` file instead.
+#### `ebs_optimized`
 
-The AWS [secret access key][credentials_docs] to use.
+Option to launch EC2 instance with optimized EBS volume. See
+[Amazon EC2 Instance Types](http://aws.amazon.com/ec2/instance-types/) to find
+out more about instance types that can be launched as EBS-optimized instances.
 
-### shared\_credentials\_profile
+The default is `false`.
 
-The EC2 [profile name][credentials_docs] to use when reading credentials out
-of `~/.aws/credentials`.  If it is not specified AWS will read the `Default`
-profile credentials (if using this method of authentication).
+#### Password
 
-Can also be specified as `ENV['AWS_PROFILE']`.
+For Windows instances the generated Administrator password is fetched
+automatically from Amazon EC2 with the same private key as we use for
+SSH logins to Linux.
 
-### aws\_ssh\_key\_id
+### Windows Configuration
 
-**Required** The EC2 [SSH key id][key_id_docs] to use.
+If you specify a platform name starting with `windows`, Test Kitchen will pull a
+default AMI out of `amis.json` if one is not specified.
 
-The default will be read from the `AWS_SSH_KEY_ID` environment variable if set,
-or `nil` otherwise.
+The default user_data will add any `username` with its associated `password`
+from the transport options to the Aministrator group.  If no `username` is
+specified then the default `administrator` is available.
 
-### aws\_session\_token
+AWS automatically generates an `administrator` password in the default
+Windows AMIs.  Test Kitchen fetches this and stores it in the
+`.kitchen/#{platform}.json` file.  If you need to `kitchen login` to the instance
+and you have not specified your own `username` and `password` you can use
+the `administrator` user and the password from this file.  Unfortunately
+we cannot auto-fill the RDP password at this point.
 
-**Deprecated** It is recommended to use the `AWS_SESSION_TOKEN` or the
-`~/.aws/credentials` file instead.
+### Other Configuration
 
-The AWS [session token][credentials_docs] to use.
+#### `availability_zone`
 
-### flavor\_id
+The AWS [availability zone][region_docs] to use.  Only request
+the letter designation - will attach this to the region used.
 
-**Deprecated** See [instance_type](#config-instance_type) below.
+If not specified, your instances will be placed in an AZ of AWS's choice in your
+region.
 
-### <a name="config-instance_type"></a> instance\_type
+### <a name="config-instance_type"></a> `instance_type`
 
 The EC2 [instance type][instance_docs] (also known as size) to use.
 
-The default is `"m1.small"`.
+The default is `t2.micro` or `t1.micro`, depending on whether the image is `hvm`
+or `paravirtual`. (`paravirtual` images are incompatible with `t2.micro`.)
 
-### security_group_ids
+### `security_group_ids`
 
 An Array of EC2 [security groups][group_docs] which will be applied to the
 instance.
 
 The default is `["default"]`.
 
-### image\_id
-
-**Required** The EC2 [AMI id][ami_docs] to use.
-
-The default will be determined by the `aws_region` chosen and the Platform
-name, if a default exists (see [amis.json][ami_json]). If a default cannot be
-computed, then the default is `nil`.
-
-### region
+### `region`
 
 **Required** The AWS [region][region_docs] to use.
 
 If the environment variable `AWS_REGION` is populated that will be used.
 Otherwise the default is `"us-east-1"`.
 
-### subnet\_id
+### `subnet_id`
 
 The EC2 [subnet][subnet_docs] to use.
 
 The default is unset, or `nil`.
 
-### tags
+### `tags`
 
 The Hash of EC tag name/value pairs which will be applied to the instance.
 
 The default is `{ "created-by" => "test-kitchen" }`.
 
-### user\_data
+### `user_data`
 
 The user_data script or the path to a script to feed the instance.
 Use bash to install dependencies or download artifacts before chef runs.
@@ -218,19 +278,19 @@ On Windows instances we specify a default that enables winrm and
 adds a non-administrator user specified in the `username` transport
 options to the Administrator's User Group.
 
-### iam\_profile\_name
+### `iam_profile_name`
 
 The EC2 IAM profile name to use.
 
 The default is `nil`.
 
-### price
+### `price`
 
 The price you bid in order to submit a spot request. An additional step will be required during the spot request process submission. If no price is set, it will use an on-demand instance.
 
 The default is `nil`.
 
-### http\_proxy
+### `http_proxy`
 
 Specify a proxy to send AWS requests through.  Should be of the format `http://<host>:<port>`.
 
@@ -238,62 +298,42 @@ The default is `ENV["HTTPS_PROXY"] || ENV["HTTP_PROXY"]`.  If you have these env
 
 **Note** - The AWS command line utility allow you to specify [two proxies](http://docs.aws.amazon.com/cli/latest/userguide/cli-http-proxy.html), one for HTTP and one for HTTPS.  The AWS Ruby SDK only allows you to specify 1 proxy and because all requests are `https://` this proxy needs to support HTTPS.
 
-## Disk Configuration
-
-### ebs\_volume\_size
-
-**Deprecated** See [block_device_mappings](#config-block_device_mappings) below.
-
-Size of ebs volume in GB.
-
-### ebs\_delete\_on\_termination
+### Disk Configuration
 
-**Deprecated** See [block_device_mappings](#config-block_device_mappings) below.
-
-`true` if you want ebs volumes to get deleted automatically after instance is terminated, `false` otherwise
-
-### ebs\_device\_name
-
-**Deprecated** See [block_device_mappings](#config-block_device_mappings) below.
-
-name of your ebs device, for example: `/dev/sda1`
-
-### <a name="config-block_device_mappings"></a> block\_device\_mappings
+#### <a name="config-block_device_mappings"></a> `block_device_mappings`
 
 A list of block device mappings for the machine.  An example of all available keys looks like:
 ```yaml
 block_device_mappings:
-  - ebs_device_name: /dev/sda
-    ebs_volume_size: 20
-    ebs_delete_on_termination: true
-  - ebs_device_name: /dev/sdb
-    ebs_volume_type: gp2
-    ebs_virtual_name: test
-    ebs_volume_size: 15
-    ebs_delete_on_termination: true
-    ebs_snapshot_id: snap-0015d0bc
-  - ebs_device_name: /dev/sdc
-    ebs_volume_size: 100
-    ebs_delete_on_termination: true
-    ebs_volume_type: io1
-    ebs_iops: 100
+  - device_name: /dev/sda
+    ebs:
+      volume_size: 20
+      delete_on_termination: true
+  - device_name: /dev/sdb
+    ebs:
+      volume_type: gp2
+      virtual_name: test
+      volume_size: 15
+      delete_on_termination: true
+      snapshot_id: snap-0015d0bc
+  - device_name: /dev/sdc
+    ebs:
+      volume_size: 100
+      delete_on_termination: true
+      volume_type: io1
+      iops: 100
 ```
 
-The keys `ebs_device_name`, `ebs_volume_size` and `ebs_delete_on_termination` are required for every mapping.
-For backwards compatiability a default `block_device_mappings` will be created if none are listed and the deprecated
-storage config keys are present.
-
-The keys `ebs_volume_type`, `ebs_virtual_name` and `ebs_snapshot_id` are optional.  See
-[Amazon EBS Volume Types](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSVolumeTypes.html) to find out more about
-volume types. `ebs_volume_type` defaults to `standard` but can also be `gp2` or `io1`.  If you specify `io1` you must
-also specify `ebs_iops`.
+See
+[Amazon EBS Volume Types](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSVolumeTypes.html)
+to find out more about volume types.
 
-If you have a block device mapping with a `ebs_device_name` equal to the root storage device name on your
+If you have a block device mapping with a `device_name` equal to the root storage device name on your
 [image](#config-image-id) then the provided mapping will replace the settings in the image.
 
 If this is not provided it will use the default block_device_mappings from the AMI.
 
-### ebs\_optimized
+#### `ebs_optimized`
 
 Option to launch EC2 instance with optimized EBS volume. See
 [Amazon EC2 Instance Types](http://aws.amazon.com/ec2/instance-types/) to find
@@ -301,9 +341,9 @@ out more about instance types that can be launched as EBS-optimized instances.
 
 The default is `false`.
 
-## Network and Communication Configuration
+### Network and Communication Configuration
 
-### associate\_public\_ip
+#### `associate_public_ip`
 
 AWS does not automatically allocate public IP addresses for instances created
 within non-default [subnets][subnet_docs]. Set this option to `true` to force
@@ -317,13 +357,13 @@ instance unless you have a VPN connection to your
 The default is `true` if you have configured a [subnet_id](#config-subnet-id),
 or `false` otherwise.
 
-### private\_ip\_address
+#### `private_ip_address`
 
 The primary private IP address of your instance.
 
 If you don't set this it will default to whatever DHCP address EC2 hands out.
 
-### interface
+#### `interface`
 
 The place from which to derive the hostname for communicating with the instance.  May be `dns`, `public` or `private`.  If this is unset, the driver will derive the hostname by failing back in the following order:
 
@@ -333,63 +373,6 @@ The place from which to derive the hostname for communicating with the instance.
 
 The default is unset.
 
-### ssh\_key
-
-**Deprecated** Instead use the `ssh_key` transport option like
-
-```ruby
-transport:
-  ssh_key: ~/.ssh/id_rsa
-```
-
-Path to the private SSH key used to connect to the instance.
-
-The default is unset, or `nil`.
-
-### ssh\_timeout
-
-**Deprecated** Instead use the `connection_timeout` transport key like
-
-```ruby
-transport:
-  connection_timeout: 60
-```
-
-The number of seconds to sleep before trying to SSH again.
-
-The default is `1`.
-
-### ssh\_retries
-
-**Deprecated** Instead use the `connection_retries` transport key like
-
-```ruby
-transport:
-  connection_retries: 10
-```
-
-The number of times to retry SSH-ing into the instance.
-
-The default is `3`.
-
-### username
-
-**Deprecated** Instead use the `username` transport key like
-
-```ruby
-transport:
-  username: ubuntu
-```
-
-The SSH username that will be used to communicate with the instance.
-
-The default will be determined by the Platform name, if a default exists (see
-[amis.json][amis_json]). If a default cannot be computed, then the default is
-`"root"`.
-
-On Windows hosts with the default `user_data` this user is added to the
-Administrator's group.
-
 ## Example
 
 The following could be used in a `.kitchen.yml` or in a `.kitchen.local.yml`
@@ -423,20 +406,22 @@ platforms:
     driver:
       image_id: ami-83211eb3
       block_device_mappings:
-        - ebs_device_name: /dev/sda1
-          ebs_volume_type: standard
-          ebs_virtual_name: test
-          ebs_volume_size: 15
-          ebs_delete_on_termination: true
+        - device_name: /dev/sda1
+          ebs:
+            volume_type: standard
+            virtual_name: test
+            volume_size: 15
+            delete_on_termination: true
   - name: centos-7
     driver:
       image_id: ami-c7d092f7
       block_device_mappings:
-        - ebs_device_name: /dev/sdb
-          ebs_volume_type: gp2
-          ebs_virtual_name: test
-          ebs_volume_size: 8
-          ebs_delete_on_termination: true
+        - device_name: /dev/sdb
+          ebs:
+            volume_type: gp2
+            virtual_name: test
+            volume_size: 8
+            delete_on_termination: true
     transport:
       username: centos
   - name: windows-2012r2
@@ -475,8 +460,7 @@ Apache 2.0 (see [LICENSE][license])
 [license]:          https://github.com/test-kitchen/kitchen-ec2/blob/master/LICENSE
 [repo]:             https://github.com/test-kitchen/kitchen-ec2
 [driver_usage]:     https://github.com/test-kitchen/kitchen-ec2
-[chef_omnibus_dl]:  http://www.getchef.com/chef/install/
-
+[chef_omnibus_dl]:  https://downloads.chef.io/chef-client/
 [amis_json]:        https://github.com/test-kitchen/kitchen-ec2/blob/master/data/amis.json
 [ami_docs]:         http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ComponentsAMIs.html
 [aws_site]:         http://aws.amazon.com/