Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

block device examples updated #136

Merged
merged 3 commits into from
Jun 9, 2015
Merged

block device examples updated #136

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9898d66
block device examples updated
May 28, 2015
a6828f4
updated .kitchen.yml example
Jun 8, 2015
6427cc7
single letter AZ update
Jun 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 25 additions & 18 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,10 +232,10 @@ name of your ebs device, for example: `/dev/sda1`
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/sda1
- ebs_device_name: /dev/sda
ebs_volume_size: 20
ebs_delete_on_termination: true
- ebs_device_name: /dev/sda2
- ebs_device_name: /dev/sdb
ebs_volume_type: gp2
ebs_virtual_name: test
ebs_volume_size: 15
Expand Down Expand Up @@ -361,21 +361,14 @@ driver:
name: ec2
aws_ssh_key_id: id_rsa-aws
security_group_ids: ["sg-1a2b3c4d"]
region: us-east-1
availability_zone: b
region: us-west-2
availability_zone: us-west-2b
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know this was broken earlier, but I would like to encourage people to use the single-letter form of this config to DRY this yaml up a bit. Would you try b with the latest version of kitchen-ec2 (0.9.5+)?

require_chef_omnibus: true
subnet_id: subnet-6d6...
subnet_id: subnet-6e5d4c3b
iam_profile_name: chef-client
instance_type: t2.micro
instance_type: m3.medium
associate_public_ip: true
private_ip_address: 10.0.0.27
interface: dns
block_device_mappings:
- ebs_device_name: /dev/sda0
ebs_volume_type: gp2
ebs_virtual_name: test
ebs_volume_size: 15
ebs_delete_on_termination: true

transport:
ssh_key: /path/to/id_rsa-aws
Expand All @@ -385,13 +378,27 @@ transport:

platforms:
- name: ubuntu-12.04
- name: centos-6.4
- name: ubuntu-15.04
driver:
image_id: ami-fd20ad94
username: ubuntu
- name: centos-6.3
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
- name: centos-7
driver:
image_id: ami-ef5ff086
username: ec2-user
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
transport:
username: centos

suites:
# ...
Expand Down