README.md in kitchen-ec2-2.1.0 vs README.md in kitchen-ec2-2.2.0
- old
+ new
@@ -12,11 +12,11 @@
## Quick Start
1. Install [ChefDK](https://downloads.chef.io/chefdk). If testing things other
than Chef cookbooks, please consult your driver's documentation for information
on what to install.
-2. Install the [AWS command line tools](http://docs.aws.amazon.com/cli/latest/userguide/cli-chap-getting-set-up.html).
+2. Install the [AWS command line tools](https://docs.aws.amazon.com/cli/latest/userguide/installing.html).
3. Run `aws configure`. This will set up your AWS credentials for both the AWS
CLI tools and kitchen-ec2.
4. Add or exit the `driver` section of your `.kitchen.yml`:
```yaml
@@ -150,11 +150,11 @@
the AWS credentials. Generally, SSH and WinRM use an AWS key pair which you
specify.
#### SSH
-The `aws_ssh_key_id` value is the name of the AWS key pair you want to use. The default will be read from the `AWS_SSH_KEY_ID` environment variable if set. If a key ID is not specified, a temporary key will be created for you.
+The `aws_ssh_key_id` value is the name of the AWS key pair you want to use. The default will be read from the `AWS_SSH_KEY_ID` environment variable if set. If a key ID is not specified, a temporary key will be created for you (**>= 2.1.0**).
To see a list of existing key pair IDs in a region, run `aws ec2 describe-key-pairs --region us-east-1`.
When using an existing key, ensure that the private key is configured in your
Test Kitchen `transport`, either directly or made available via `ssh-agent`:
@@ -192,11 +192,11 @@
#### `security_group_ids`
An Array of EC2 [security groups][group_docs] which will be applied to the
instance. If no security group is specified, a temporary group will be created
-automatically which allows SSH and WinRM.
+automatically which allows SSH and WinRM (**>= 2.1.0**).
#### `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.
@@ -423,22 +423,12 @@
connection_timeout: 10
connection_retries: 5
username: ubuntu
platforms:
- - name: ubuntu-12.04
- - name: centos-6.4
- - name: ubuntu-15.04
- driver:
- image_id: ami-83211eb3
- block_device_mappings:
- - device_name: /dev/sda1
- ebs:
- volume_type: standard
- virtual_name: test
- volume_size: 15
- delete_on_termination: true
+ - name: ubuntu-16.04
+ - name: centos-6.9
- name: centos-7
driver:
image_id: ami-c7d092f7
block_device_mappings:
- device_name: /dev/sdb
@@ -448,11 +438,11 @@
volume_size: 8
delete_on_termination: true
transport:
username: centos
- name: windows-2012r2
- - name: windows-2008r2
+ - name: windows-2016
suites:
# ...
```
@@ -479,19 +469,19 @@
[author]: https://github.com/fnichol
[issues]: https://github.com/test-kitchen/kitchen-ec2/issues
[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]: https://downloads.chef.io/chef-client/
+[chef_omnibus_dl]: https://downloads.chef.io/chef
[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/
[iam_site]: http://aws.amazon.com/iam
-[credentials_docs]: http://blogs.aws.amazon.com/security/post/Tx3D6U6WSFGOK2H/A-New-and-Standardized-Way-to-Manage-Credentials-in-the-AWS-SDKs
-[aws_sdk_gem]: http://docs.aws.amazon.com/sdkforruby/api/index.html
-[group_docs]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-network-security.html
-[instance_docs]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html
-[key_id_docs]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/verifying-your-key-pair.html
-[kitchenci]: http://kitchen.ci/
-[region_docs]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-regions-availability-zones.html
-[subnet_docs]: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html
-[vpc_docs]: http://docs.aws.amazon.com/AmazonVPC/latest/GettingStartedGuide/ExerciseOverview.html
+[credentials_docs]: https://aws.amazon.com/blogs/security/a-new-and-standardized-way-to-manage-credentials-in-the-aws-sdks/
+[aws_sdk_gem]: https://docs.aws.amazon.com/sdkforruby/api/index.html
+[group_docs]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-network-security.html
+[instance_docs]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html
+[key_id_docs]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-key-pairs.html
+[kitchenci]: https://kitchen.ci/
+[region_docs]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-regions-availability-zones.html
+[subnet_docs]: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html
+[vpc_docs]: https://docs.aws.amazon.com/AmazonVPC/latest/GettingStartedGuide/ExerciseOverview.html