Commit graph

108 commits

Author SHA1 Message Date
joshuaeke
88f221fd9f Update ec2.py remove state tag
'exact_count' and 'state' are mutually exclusive options they should not be in the following examples:
- # Enforce that 5 running instances named "database" with a "dbtype" of "postgres" example and
- # Enforce that 5 instances with a tag "foo" are running
2016-12-08 11:23:49 -05:00
Toshio Kuratomi
a90de29ceb Minor simplification of code 2016-12-08 11:23:49 -05:00
Brian Coca
2efb97e9d5 corrected version_added, removed empty alias 2016-12-08 11:23:49 -05:00
Keith Hassen
f7dfcc153e Fail if any group name is not resolved to an ID. 2016-12-08 11:23:48 -05:00
Kevin Falcone
35e6684163 Mark this as a string so it is rendered in the docs
When this was treated as a boolean, sphinx was leaving the Default
column on http://docs.ansible.com/ansible/ec2_module.html blank,
implying it would use AWS's default.  In reality, it passes False, which
overrides the defaults at AWS (it's possible to boot an instance which
AWS claims will always have EBS optimization without it because of this
silently passed False).
2016-12-08 11:23:46 -05:00
Kai Webber
4a8bd74f52 Added launch group support for ec2 module 2016-12-08 11:23:46 -05:00
Gilad Peleg
9cb4388f9e Add state=running on some ec2 examples
`state=running` was missing in some of the ec2 module examples
2016-12-08 11:23:45 -05:00
Abhijit Menon-Sen
e9071c62ba Add missing variable initializations
Without this, «ec2: state=stopped instance_ids=…» would fail with a
traceback like this:

    if inst.get_attribute('sourceDestCheck')['sourceDestCheck'] != source_dest_check:
NameError: global name 'source_dest_check' is not defined
2016-12-08 11:23:40 -05:00
fperks
11dbd985b6 Fix error on ec2 status change
Both `source_dest_check` and `termination_protection` variables are not
available within the scope of the startstopec2 instance method. This just
pulls them from module.params.
2016-12-08 11:23:39 -05:00
Gerard Lynch
f85a8ac746 allow use of volume_type in volumes dict 2016-12-08 11:23:37 -05:00
Yanchek99
ebbd206e86 Fixed typo for instance_tags documentation 2016-12-08 11:23:35 -05:00
Bret Martin
b1c5b17155 Use general-purpose parameter mutual exclusion code for network_interfaces 2016-12-08 11:23:35 -05:00
Bret Martin
0afa813324 Add alias network_interface and accept a string for a single ENI 2016-12-08 11:23:35 -05:00
Bret Martin
df8b2d45bc Add network_interfaces example 2016-12-08 11:23:35 -05:00
Bret Martin
96d8401fb4 Remove aliases specification from documentation since there are none 2016-12-08 11:23:35 -05:00
Bret Martin
df713192b4 Add network_interfaces parameter to ec2 module to support launch-time ENIs 2016-12-08 11:23:34 -05:00
James Cammarata
b9ca912ffe Fixing region requirement regarding euca clusters
Fixes ansible/ansible#11023
2016-12-08 11:23:32 -05:00
HAMSIK Adam
217764ba3c Rebase start/stop instance pull code 2016-12-08 11:23:31 -05:00
Brian Coca
357d542bb3 clarified error messages to actually give back ansible module option instead of internal boto field name 2016-12-08 11:23:26 -05:00
Jens Carl
c0eedc6e87 Fix missing alias "groups". 2016-12-08 11:23:26 -05:00
vanga
ddd399fe7a Throw error if encryption is set while passing a snapshot id 2016-12-08 11:23:20 -05:00
Juho-Mikko Pellinen
29620b78fa Change the default flag value to None to prevent AWS complaining: "Instance creation failed => InvalidBlockDeviceMapping: the encrypted flag cannot be specified since device /dev/sda1 has a snapshot specified." 2016-12-08 11:23:18 -05:00
Andrea Mandolo
ae1080d922 Added some block_device_mapping (disks) informations to EC2 instance module ouput 2016-12-08 11:23:15 -05:00
Andrea Mandolo
a8da674cf4 Added "EC2 instance" termination_protection and source_dest_check changeability at run-time 2016-12-08 11:23:15 -05:00
James Cammarata
4239922d07 Updating version_added for new spot_type param in ec2 module
Also made sure 'choices' were set on the module param, to catch errors
in user's playbooks, etc.
2016-12-08 11:23:11 -05:00
Jay Taylor
ed279d8175 Added support for spot request type specification (to support persistent spot requests). 2016-12-08 11:23:11 -05:00
Philip Kirkland
cc214afed6 adding 'encrypted' option into volume dict so ec2 module can easily include encrypted volumes 2016-12-08 11:23:09 -05:00
nitzmahone
548ab163f5 Added choice validation for state arg
fixes traceback on invalid state arg
2016-12-08 11:23:08 -05:00
Greg DeKoenigsberg
18ca7aee07 Updating cloud modules with proper github author information 2016-12-08 11:23:07 -05:00
Wang Qiang
86b6f39cf0 Do instance update after add tags to instance. 2016-12-08 11:23:01 -05:00
Benno Joy
d24fbf5c3e fixe issue #600, where ec2 module returns instance state as runing even after instance is terminated 2016-12-08 11:22:59 -05:00
Martin Froehlich
8bff781a0a Use get_aws_connection_info to get AWS creds.
Previously used get_ec2_creds did not consider security_token,
making MFA requests fail.
2016-12-08 11:22:58 -05:00
Alex Feinberg
1ac9c20b6e Fix a typo in create_instances
Fix a typo in create_instances: use 'placement_group' instead of placement_group
when calling boto_siupports_param_in_spot_request().
2016-12-08 11:22:57 -05:00
steenzout
67f769d9a6 issue #994: use HAS_BOTO to determine if import was successful: - removed import of sys module. - HAS_BOTO constant to check if import was successful. - trigger a failure when import fails. - removed unnecessary imports. 2016-12-08 11:22:53 -05:00
Lorin Hochstein
5224375a5a Use the correct alias syntax 2016-12-08 11:22:51 -05:00
Lorin Hochstein
17e6be671b ec2 module: add instance_id alias
Create an alias named instance_id for the instance_ids parameter.
2016-12-08 11:22:51 -05:00
Toshio Kuratomi
c9b33d5de2 Fix for py2.6 (no dict comprehensions on py2.6) 2016-12-08 11:22:48 -05:00
Toshio Kuratomi
c9cc8d0b70 Initialize the value of vpc_id variable 2016-12-08 11:22:48 -05:00
Bret Martin
650a7365f9 Allow vpc_subnet_id to remain unspecified (see bc0c169) 2016-12-08 11:22:47 -05:00
Toshio Kuratomi
49511ea078 Small code cleanup 2016-12-08 11:22:46 -05:00
Brandon W Maister
2121bbc208 ec2: Apply all security groups at instance-creation
The code was picking out the first instance from the security groups
specified, even when multiple groups were specified. Now we use all of
them.
2016-12-08 11:22:46 -05:00
Capi Etheriel
103caa2853 add ec2 instance tags and groups info 2016-12-08 11:22:44 -05:00
Bret Martin
ed3f1a133b ec2: make group only match group names in this VPC 2016-12-08 11:22:43 -05:00
Brian Coca
cd7f498755 Revert "Revert "Don't use 'tenancy' in ec2 spot requests"" 2016-12-08 11:22:43 -05:00
Brian Coca
6e55a0324b Revert "Don't use 'tenancy' in ec2 spot requests" 2016-12-08 11:22:43 -05:00
Luc Bourlier
ae97d76a12 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.
2016-12-08 11:22:41 -05:00
Jean-Baptiste Barth
c0b2960892 Improve formatting after previous commit 2016-12-08 11:22:41 -05:00
Jean-Baptiste Barth
58ff9bece2 EC2: move logic about terminated instances up (#423)
As stated in #423, the commit 7f11c3d broke ec2 spot instance launching
after 1.7.2. This is because it acts on the 'res' variable which have 2
different types in the method, and in case we request spot instances,
the resulting object is not a result of ec2.run_instances() but
ec2.request_spot_instances(). Actually this fix doesn't seem to be
relevant in the spot instances case, because by construction we won't
retrieve 'terminated' instances in the end.
2016-12-08 11:22:40 -05:00
Brian Coca
f90da6b2ba ec2 fix docs format 2016-12-08 11:22:39 -05:00
Brian Coca
1f1ebf248f updated tenancy version added 2016-12-08 11:22:39 -05:00