diff options
| author | Brian Coca <bcoca@ansible.com> | 2015-02-18 11:07:13 -0500 |
|---|---|---|
| committer | Brian Coca <bcoca@ansible.com> | 2015-02-18 11:07:13 -0500 |
| commit | 77241123a7d1f188dc5d6d5d162dbf0da932f098 (patch) | |
| tree | efd7c7558b27606792b7b9b0d9efc729b8d546ee | |
| parent | 0adcaacd798e6f56a0513dbd35283dc623224198 (diff) | |
| download | ansible-modules-core-revert-806-revert-753-fix/ec2-spot-no-tenancy.tar.gz | |
Revert "Revert "Don't use 'tenancy' in ec2 spot requests""revert-806-revert-753-fix/ec2-spot-no-tenancy
| -rwxr-xr-x | cloud/amazon/ec2.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cloud/amazon/ec2.py b/cloud/amazon/ec2.py index d34931c9..4d65fbf9 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): |