From 2740ec9f30c100f77b683431b362577d49756540 Mon Sep 17 00:00:00 2001 From: Lorin Hochstein Date: Sun, 29 Jun 2014 16:53:52 -0400 Subject: [PATCH] ec2_ami_search: new EBS types In ec2_ami_search module, add support for the new SSD-backed EBS (ebs-ssd) volume as well as support for provisioned IOPS (ebs-io1). --- cloud/ec2_ami_search | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cloud/ec2_ami_search b/cloud/ec2_ami_search index 932dca855a8..07c0dc2ab10 100644 --- a/cloud/ec2_ami_search +++ b/cloud/ec2_ami_search @@ -45,7 +45,7 @@ options: description: Back-end store for instance required: false default: "ebs" - choices: ["ebs", "instance-store"] + choices: ["ebs", "ebs-io1", "ebs-ssd", "instance-store"] arch: description: CPU architecture required: false @@ -135,7 +135,7 @@ def lookup_ubuntu_ami(table, release, stream, store, arch, region, virt): (release, stream, tag, serial, region, ami, aki, ari, virt) release: ubuntu release name stream: 'server' or 'desktop' - store: 'ebs' or 'instance-store' + store: 'ebs', 'ebs-io1', 'ebs-ssd' or 'instance-store' arch: 'i386' or 'amd64' region: EC2 region virt: 'paravirtual' or 'hvm' @@ -172,7 +172,7 @@ def main(): stream=dict(required=False, default='server', choices=['desktop', 'server']), store=dict(required=False, default='ebs', - choices=['ebs', 'instance-store']), + choices=['ebs', 'ebs-io1', 'ebs-ssd', 'instance-store']), arch=dict(required=False, default='amd64', choices=['i386', 'amd64']), region=dict(required=False, default='us-east-1', choices=AWS_REGIONS),