Merge pull request #806 from ansible/revert-753-fix/ec2-spot-no-tenancy

Revert "Don't use 'tenancy' in ec2 spot requests"
This commit is contained in:
Brian Coca 2015-02-18 08:59:37 -05:00
commit 0adcaacd79

View file

@ -834,8 +834,7 @@ def create_instances(module, ec2, override_count=None):
if ebs_optimized:
params['ebs_optimized'] = ebs_optimized
# 'tenancy' always has a default value, but it is not a valid parameter for spot instance resquest
if not spot_price:
if tenancy:
params['tenancy'] = tenancy
if boto_supports_profile_name_arg(ec2):