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

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

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):