From df53b85259dadc0054de653b4e20426acbfca710 Mon Sep 17 00:00:00 2001 From: Luc Bourlier Date: Fri, 6 Feb 2015 13:50:43 +0000 Subject: [PATCH] Don't use 'tenancy' in ec2 spot requests The problem was introduced in commit f5789e8e. 'tenancy' is a parameter of ec2.run_instances, but not in ec2.request_spot_instances. So it was breaking the support for spot requests. --- cloud/amazon/ec2.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cloud/amazon/ec2.py b/cloud/amazon/ec2.py index d34931c9914..4d65fbf9841 100755 --- a/cloud/amazon/ec2.py +++ b/cloud/amazon/ec2.py @@ -834,7 +834,8 @@ def create_instances(module, ec2, override_count=None): if 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 if boto_supports_profile_name_arg(ec2):