---
driver:
  name: ec2
  aws_access_key_id: <%= ENV['AWS_ACCESS_KEY'] %>
  aws_secret_access_key: <%= ENV['AWS_SECRET_KEY'] %>
  aws_ssh_key_id: aws_dev
  ssh_key: <%= ENV['HOME'] %>/.ssh/aws_dev.pem
  region: us-east-1
  availability_zone: us-east-1b
  security_group_ids: ['ci-testing']
  flavor_id: c3.xlarge
  require_chef_omnibus: true
  username: ubuntu
  iam_profile_name: test-ebs-attachment

provisioner:
  name: chef_zero

platforms:
- name: ubuntu-12.04
  driver:
    image_id: ami-e002a788
    tags:
      Name: storage-default-ubuntu-1204
      Env: public
- name: ubuntu-14.04
  driver:
    image_id: ami-d0ba0cb8
    tags:
      Name: storage-default-ubuntu-1404
      Env: public

suites:
  - name: ec2
    run_list:
      - recipe[aws::ec2_hints]
      - recipe[storage::default]
    attributes:
      storage:
        ebs_volumes:
          vol1:
            device: /dev/xvde
            size: 2
            delete_on_termination: true

---
driver:
  name: ec2
  aws_ssh_key_id: <%= ENV['AWS_KEYPAIR_NAME'] %>
  region: us-east-1
  availability_zone: us-east-1b
  security_group_ids: ['ci-testing']
  instance_type: c3.xlarge
  interface: public
  iam_profile_name: test-ebs-attachment

transport:
  name: sftp
  ssh_key: <%= ENV['EC2_SSH_KEY_PATH'] %>

provisioner:
  name: chef_zero

platforms:
- name: ubuntu-14.04
  tags:
    Name: storage-default-ubuntu-1404
    Type: test

suites:
  - name: ec2
    run_list:
      - recipe[aws::ec2_hints]
      - recipe[storage::default]
    attributes:
      storage:
        ebs_volumes:
          vol1:
            device: /dev/xvde
            size: 2
            delete_on_termination: true

Update the Kitchen YAML and remove old/redundant tests/defaults
Update the Kitchen YAML and remove old/redundant tests/defaults
