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

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

Browse source 
Revert "Revert "Don't use 'tenancy' in ec2 spot requests""
This commit is contained in:
Brian Coca 2015-02-18 11:07:26 -05:00
commit 344d6dd377
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cloud/amazon/ec2.py
View file

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