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