Merge pull request #6850 from atlashealth/ec2_set_ebs_optimized
ec2: added ability to set EBS optimized instances
This commit is contained in:
commit
dfa8aef408
1 changed files with 13 additions and 1 deletions
|
@ -217,6 +217,12 @@ options:
|
|||
required: false
|
||||
default: null
|
||||
aliases: []
|
||||
ebs_optimized:
|
||||
version_added: "1.6"
|
||||
description:
|
||||
- whether instance is using optimized EBS volumes, see U(http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSOptimized.html)
|
||||
required: false
|
||||
default: false
|
||||
exact_count:
|
||||
version_added: "1.5"
|
||||
description:
|
||||
|
@ -604,7 +610,8 @@ def get_instance_info(inst):
|
|||
'root_device_type': inst.root_device_type,
|
||||
'root_device_name': inst.root_device_name,
|
||||
'state': inst.state,
|
||||
'hypervisor': inst.hypervisor}
|
||||
'hypervisor': inst.hypervisor,
|
||||
'ebs_optimized': inst.ebs_optimized}
|
||||
try:
|
||||
instance_info['virtualization_type'] = getattr(inst,'virtualization_type')
|
||||
except AttributeError:
|
||||
|
@ -767,6 +774,7 @@ def create_instances(module, ec2, override_count=None):
|
|||
private_ip = module.params.get('private_ip')
|
||||
instance_profile_name = module.params.get('instance_profile_name')
|
||||
volumes = module.params.get('volumes')
|
||||
ebs_optimized = module.params.get('ebs_optimized')
|
||||
exact_count = module.params.get('exact_count')
|
||||
count_tag = module.params.get('count_tag')
|
||||
source_dest_check = module.boolean(module.params.get('source_dest_check'))
|
||||
|
@ -827,6 +835,9 @@ def create_instances(module, ec2, override_count=None):
|
|||
'ramdisk_id': ramdisk,
|
||||
'user_data': user_data}
|
||||
|
||||
if ebs_optimized:
|
||||
params['ebs_optimized'] = ebs_optimized
|
||||
|
||||
if boto_supports_profile_name_arg(ec2):
|
||||
params['instance_profile_name'] = instance_profile_name
|
||||
else:
|
||||
|
@ -1144,6 +1155,7 @@ def main():
|
|||
exact_count = dict(type='int', default=None),
|
||||
count_tag = dict(),
|
||||
volumes = dict(type='list'),
|
||||
ebs_optimized = dict(),
|
||||
)
|
||||
)
|
||||
|
||||
|
|
Loading…
Reference in a new issue