cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #7983 from lorin/new-ebs-types

Browse source 
ec2_ami_search: support for SSD and IOPS provisioned EBS images
This commit is contained in:
Michael DeHaan 2014-08-08 11:54:51 -04:00
commit e85669b0c8
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cloud/ec2_ami_search
View file

@ -45,7 +45,7 @@ options:
description: Back-end store for instance description: Back-end store for instance
required: false required: false
default: "ebs" default: "ebs"
choices: ["ebs", "instance-store"] choices: ["ebs", "ebs-io1", "ebs-ssd", "instance-store"]
arch: arch:
description: CPU architecture description: CPU architecture
required: false 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, stream, tag, serial, region, ami, aki, ari, virt)
release: ubuntu release name release: ubuntu release name
stream: 'server' or 'desktop' stream: 'server' or 'desktop'
store: 'ebs' or 'instance-store' store: 'ebs', 'ebs-io1', 'ebs-ssd' or 'instance-store'
arch: 'i386' or 'amd64' arch: 'i386' or 'amd64'
region: EC2 region region: EC2 region
virt: 'paravirtual' or 'hvm' virt: 'paravirtual' or 'hvm'
@ -172,7 +172,7 @@ def main():
stream=dict(required=False, default='server', stream=dict(required=False, default='server',
choices=['desktop', 'server']), choices=['desktop', 'server']),
store=dict(required=False, default='ebs', store=dict(required=False, default='ebs',
choices=['ebs', 'instance-store']), choices=['ebs', 'ebs-io1', 'ebs-ssd', 'instance-store']),
arch=dict(required=False, default='amd64', arch=dict(required=False, default='amd64',
choices=['i386', 'amd64']), choices=['i386', 'amd64']),
region=dict(required=False, default='us-east-1', choices=AWS_REGIONS), region=dict(required=False, default='us-east-1', choices=AWS_REGIONS),