README.md in kitchen-ec2-1.2.0 vs README.md in kitchen-ec2-1.3.0

- old
+ new

@@ -77,23 +77,34 @@ 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-14.04 - image_search: - owner-id: "099720109477" - name: ubuntu/images/*/ubuntu-*-14.04* + driver: + image_search: + owner-id: "099720109477" + name: ubuntu/images/*/ubuntu-*-14.04* ``` 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: - HVM images over paravirtual - SSD support over magnetic drives - 64-bit over 32-bit - The most recently created image (to pick up patch releases) +Note that the image_search method *requires* that the AMI image names be in a specific format. +Some examples are: + +- Windows-2012 +- Windows-2012r2 +- Windows-2012r2sp1 +- RHEL-7.2 + +It is safest to use the same naming convention as used by the public images published by the OS vendors on the AWS marketplace. + #### `platform.name` The third way to specify the image is by leaving `image_id` and `image_search` blank, and specifying a standard platform name. @@ -245,10 +256,24 @@ An Array of EC2 [security groups][group_docs] which will be applied to the instance. The default is `["default"]`. +### `security_group_filter` + +The EC2 [security group][group_docs] which will be applied to the instance, +specified by tag. Only one group can be specified this way. + +The default is unset, or `nil`. + +An example of usage: +```yaml +security_group_filter: + tag: 'Name' + value: 'example-group-name' +``` + ### `region` **Required** The AWS [region][region_docs] to use. If the environment variable `AWS_REGION` is populated that will be used. @@ -258,10 +283,23 @@ The EC2 [subnet][subnet_docs] to use. The default is unset, or `nil`. +### `subnet_filter` + +The EC2 [subnet][subnet_docs] to use, specified by tag. + +The default is unset, or `nil`. + +An example of usage: +```yaml +subnet_filter: + tag: 'Name' + value: 'example-subnet-name' +``` + ### `tags` The Hash of EC tag name/value pairs which will be applied to the instance. The default is `{ "created-by" => "test-kitchen" }`. @@ -309,9 +347,13 @@ Specify a proxy to send AWS requests through. Should be of the format `http://<host>:<port>`. The default is `ENV["HTTPS_PROXY"] || ENV["HTTP_PROXY"]`. If you have these environment variables set and do not want to use a proxy when contacting aws set `http_proxy: nil`. **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. + +### `ssl_verify_peer` + +If you need to turn off ssl certificate verification for HTTP calls made to AWS, set `ssl_verify_peer: false`. ### Disk Configuration #### <a name="config-block_device_mappings"></a> `block_device_mappings`