From 7c42182f4711711853600644334846132868595e Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Wed, 18 Feb 2015 08:59:26 -0500 Subject: [PATCH] Revert "Don't use 'tenancy' in ec2 spot requests" --- cloud/amazon/ec2.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cloud/amazon/ec2.py b/cloud/amazon/ec2.py index 4d65fbf9841..d34931c9914 100755 --- a/cloud/amazon/ec2.py +++ b/cloud/amazon/ec2.py @@ -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):