Revert "Revert "Don't use 'tenancy' in ec2 spot requests""

10 years ago · 77241123a7
parent 0adcaacd79
commit 77241123a7
1 changed files with 2 additions and 1 deletions
--- 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):