Commit graph

306 commits

Author SHA1 Message Date
Tom Paine
c97af02e40 Update ec2.py
updated default and choices to match standard
2015-05-18 21:34:57 +01:00
Tom Paine
1f7f7c7dbc Update ec2.py
Update instance_type description to feature up-to-date list of instance types. Matches format of 'ebs_optimized' param which also includes a link.

Update region description to feature up-to-date list of ec2 regions. Matches format of 'ebs_optimized' param which also includes a link.

Updated choices for monitoring param to be explicit bool matching default 'yes'.

Updated choices for source_dest_check to be explicit bool matching default 'true'.

Updated tenancy choices to remove redundant phrasing in comments.
2015-05-18 21:30:18 +01:00
Toshio Kuratomi
81b476cd02 Update module "imports" to new style
Fixes #1351
2015-05-18 11:59:20 -07:00
Tom Paine
764c3ae5a4 Update ec2.py
Make assign_public_ip choices explicit. People incorrectly try and assign a specific IP thinking it accepts an IP address as a value.
2015-05-18 14:21:49 +01:00
Benno Joy
601fa16ada Merge pull request #1327 from bennojoy/issue_600
fixes issue #600, where ec2 module returns instance state as running ev…
2015-05-18 11:40:02 +05:30
Brian Coca
e1f68b7f33 Merge pull request #1323 from feanil/feanil/vpc_igw
Tell me what the igw id is if we created an igw.
2015-05-15 10:12:56 -04:00
Feanil Patel
77ca3c1148 Output the Internet Gatewoy id directly instead of in a dict. 2015-05-15 09:40:30 -04:00
Benno Joy
1c418805d9 Merge pull request #673 from mschurenko/ec2_elb_lb_add_stickiness
adding stickiness support to ec2_elb_lb.py
2015-05-15 15:01:11 +05:30
Benno Joy
dee65f83af Merge pull request #1212 from zimbatm/ec2_group-name_priority
ec2_group: select own group if the name matches
2015-05-15 14:47:10 +05:30
Matt Schurenko
08155f145e adding stickiness support to ec2_elb_lb.py
removing policy if enabled is no

adding sanity checks

removing debuging

check if policy exists before deleting

updating version_added to 2.0

adding stickiness support to ec2_elb_lb.py (squashed commit)
2015-05-14 22:30:45 -07:00
Benno Joy
d8b9c1f440 Merge pull request #1206 from mjfroehlich/ec2-support-mfa-auth
ec2: Use get_aws_connection_info to get AWS creds.
2015-05-14 17:46:29 +05:30
Benno Joy
ed62de6d3c Fixes issue 1197 for s3 module, where the file gets downloaded even if checksums match 2015-05-14 09:03:50 +05:30
Benno Joy
9d9d8def6f fixe issue #600, where ec2 module returns instance state as runing even after instance is terminated 2015-05-14 08:29:11 +05:30
Feanil Patel
0e213e985b Tell me what the igw id is if we created an igw. 2015-05-13 17:12:41 -04:00
Brian Coca
74351490f7 doc fix 2015-05-13 15:58:07 -04:00
whiter
da93950fe5 Added postgresql-license type 2015-05-13 16:16:41 +10:00
Jell
6b27cdc08e [ec2_vol] Find or Create volume by name 2015-05-12 07:06:37 +02:00
Toshio Kuratomi
60a66a544d Several cleanups to many modules:
* Fix docs to specify when python2.6+ is required (due to a library
  dep).  This helps us know when it is okay to use python2.6+ syntax in
  the file.
* remove BabyJson returns.  See #1211  This commit fixes all but the
  openstack modules.
* Use if __name__ == '__main__' to only run the main part of the module
  if the module is run as a program.  This allows for the potential to
  unittest the code later.
2015-05-11 12:15:53 -07:00
Brian Coca
18ccced5fe Merge pull request #1274 from bennojoy/issue-122
fixes issue 122, where the module recreates the route table in each run
2015-05-08 15:50:37 -04:00
Brian Coca
bc22ee9069 Merge pull request #1015 from jml/ec2-eip
Make ec2_eip idempotent
2015-05-08 15:24:20 -04:00
Chris Lundquist
4670e1285b [ec2_ami_find] fix ami_search doc copy pasta 2015-05-07 11:51:11 -07:00
Benno Joy
e2deee66d3 fixes issue 122, where the module recreates the route table in each run 2015-05-07 16:04:01 +05:30
Brian Coca
a9781b3712 Merge pull request #1250 from afeinberg/patch-1
Fix a typo in create_instances
2015-05-05 10:40:07 -04:00
Sam Doiron
de76c797ab Fix Issue #1216 (ValueError with Amazon RDS)
Fix typo where wrong variable was used, causing ValueError.
2015-05-05 10:53:17 -03:00
Herby Gillot
6ce3ef36e3 Use existing ec2_eip address if already associated
If an EC2 instance is already associated with an EIP address, we use
that, rather than allocating a new EIP address and associating it with
that.

Fixes #35.
2015-05-05 11:37:47 +01:00
Alex Feinberg
e749184bc7 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().
2015-05-04 17:14:42 -07:00
Pascal Borreli
f29a6ec54d Fixed typos 2015-05-04 12:54:03 +01:00
Brian Coca
9028e9d4be minor doc fixes, set version added for new tags: parameter
should Fix #10894
2015-05-01 09:58:27 -04:00
xiaclo
946af50b22 Update route53.py 2015-05-01 12:28:47 +10:00
xiaclo
5d1a3ee0ac Fix issue #1156
Fix as suggested in the issue.

https://github.com/ansible/ansible-modules-core/issues/1156
2015-04-30 13:01:00 +10:00
zimbatm
34378b6c6a ec2_group: prioritise current VPC group names over others 2015-04-28 10:19:20 +01:00
zimbatm
8a4d5856ce ec2_group: select own group if the name matches
This fixes an issue where multiple VPC have the same group name and
the one from the other VPC is selected.
2015-04-27 19:26:13 +01:00
Brian Coca
78de8bbd99 removed unused and undefined aws_regions 2015-04-27 12:38:57 -04:00
Brian Coca
e137aea5d3 Merge pull request #1195 from bcoca/ec2_scaling_policy_fix
removed redundant region def
2015-04-27 12:34:59 -04:00
Martin Froehlich
4bcbcc8869 Use get_aws_connection_info to get AWS creds.
Previously used get_ec2_creds did not consider security_token,
making MFA requests fail.
2015-04-26 14:50:07 +01:00
Brian Coca
0e23dd6c55 avoid exception when boto is not available 2015-04-24 11:03:36 -04:00
Brian Coca
a905edd536 removed redundant region def 2015-04-24 08:54:56 -04:00
Brian Coca
8ce2a18921 Merge pull request #1184 from bobby/ec2_vpc-without-subnets
Fixes regression introduced by edf1ac1ea6
2015-04-21 15:17:44 -04:00
Bobby Calderwood
98a9f2d5b8 Fixes regression introduced by edf1ac1ea6 2015-04-21 14:56:46 -04:00
bw-will-usher
0846de2cd5 Fixed MS SQL port number in documentation (1443->1433) per: https://support.microsoft.com/en-us/kb/287932 2015-04-21 07:59:05 -04:00
Brian Coca
be89a2f5fc added new ec2_ami_find as per #905 2015-04-16 15:39:26 -04:00
Brian Coca
5e1224c4a8 deprecated ec2_ami_search 2015-04-16 15:39:26 -04:00
sisso
34d6d6f777 fixed bug where scaling policy return a random policy if many autoscale group have policies with same name. 2015-04-16 14:36:26 -03:00
Brian Coca
89bd6af0ed Merge pull request #966 from jnsaff/devel
Added support for tagging images in ec2_ami.py
2015-04-16 11:35:37 -04:00
Jan Brauer
fcea4e1884 Add missing comma 2015-04-10 19:05:57 -04:00
Daekwon Kim
7684059044 Fix indent of "register" key 2015-04-09 19:10:49 +09:00
Daekwon Kim
88639ae8be Fix typo (volue -> volume) 2015-04-09 19:09:42 +09:00
James Martin
b67e1a1ce9 Streamlined rolling udpate algorithm. Still need to account for partials, and not waiting for instances if we're mass terminating them. 2015-04-07 22:16:28 -04:00
Kyle Johnson
86ed1cd0a9 Fix typo in rds_subnet_group.py
aws_connection_kwargs should be aws_connect_kwargs
2015-04-06 10:00:17 -04:00
Jesse Rusak
030703f4ca Update rds module for RDS2 parameter name change.
boto's rds2 renamed `vpc_security_groups` to `vpc_security_group_ids`
and changed from a list of `VPCSecurityGroupMembership` to just a
list of ids. This accommodates that change when rds2 is being used.
2015-04-02 15:32:12 -04:00
Dan Abel
c5f5dfd8a0 use aws connect calls that allow boto profile use 2015-04-02 10:51:18 +01:00
steenzout
d960dc1584 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.
2015-04-01 17:31:10 -06:00
Brian Coca
e6e3ade6fa added support for postgres9.4 which is now available from amazon 2015-03-31 11:46:54 -04:00
Brian Coca
613961c592 really fixed docs this time 2015-03-31 09:15:20 -04:00
Brian Coca
99391f861d fixed doc issues on cloudformation 2015-03-31 09:09:43 -04:00
Rob Johnson
ea1ffc6d19 allow both template and template_url parameters 2015-03-30 15:27:03 +01:00
Brian Coca
d27df0cdb4 Merge pull request #334 from adamchainz/cloudformation_dont_always_need_template
Make cloudformation module's template argument not required in case of stack deletion
2015-03-30 08:56:56 -04:00
Brian Coca
1865ddbbdf Merge pull request #339 from lorin/instance_id
ec2 module: add instance_id alias
2015-03-30 08:49:07 -04:00
Mick Bass
7de97864be clean rebase of https://github.com/ansible/ansible-modules-core/pull/1024 on a new branch 2015-03-29 21:56:44 -06:00
Brian Coca
8c80900fef removed requirements/boto as it broke documentation as it is duplicated in shared aws fragements 2015-03-29 17:08:08 -04:00
Brian Coca
adfcfa4b58 Merge pull request #318 from preo/ec2-group-empty-rules
Allow empty EC2 Security Group rules.
2015-03-29 10:26:33 -04:00
Brian Coca
feb5144c71 Merge pull request #1021 from defionscode/s3_conn
allow boto profile use with s3
2015-03-29 10:08:54 -04:00
Adam Chainz
8a4e7e5d9f Make cloudformation module's template argument not required in case of stack deletion 2015-03-29 09:31:13 +01:00
Kohei YOSHIDA
8ab812c242 support secure connection on fakes3 2015-03-28 23:31:53 +09:00
Jonathan Davila
611165a77e allow boto profile use with s3 2015-03-28 10:17:12 -04:00
Lorin Hochstein
ea4d5798c7 Use the correct alias syntax 2015-03-28 09:31:52 -04:00
Lorin Hochstein
e759b4d0eb ec2 module: add instance_id alias
Create an alias named instance_id for the instance_ids parameter.
2015-03-28 09:31:52 -04:00
Scott Miller
13d420ebee describe choices in alias documentation 2015-03-27 16:20:20 -04:00
Brian Coca
f3e4704d92 Merge pull request #569 from 47lining/rate-throttling-retries-update
add retry with exponential backoff when we receive throttling error code...
2015-03-27 08:21:09 -04:00
Mick Bass
64a2077787 Add support for AWS Security Token Service (temporary credentials) to all AWS cloud modules. 2015-03-26 22:44:56 -06:00
Brian Coca
eacf4e4239 Merge pull request #269 from SDFE/rds_subnet_group_params
use aws connect call in rds_subnet_group that allows boto profile use
2015-03-26 15:53:33 -04:00
Toshio Kuratomi
7e7eafb3e3 Make lack of boto call fail_json instead of sys.exit
Fixes #994
2015-03-26 12:12:39 -07:00
Brian Coca
5d776936cc Merge pull request #256 from SDFE/route53_connect_params
Use aws connect calls that allow boto profile use
2015-03-26 14:34:24 -04:00
Brian Coca
68daec05f2 Merge pull request #254 from SDFE/ec2_vpc_connect_params
use simpler ec2_connect ec2 util call
2015-03-26 14:17:27 -04:00
Brandon W Maister
efa4d04284 Make cache_subnet_group default to empty security groups
Since they can't be specified together, it seems like setting the
default to no security groups is the right option.
2015-03-26 13:56:46 -04:00
Brandon W Maister
3cb2346312 Add cache_subnet_group to elasticache module
According to the [docs] cache subnet groups are required inside a VPC.

[docs]: http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/CacheSubnetGroups.html
2015-03-26 13:56:46 -04:00
Brian Coca
0771dd12ca Merge pull request #1004 from bcoca/s3_fixes
S3 fixes
2015-03-26 12:39:36 -04:00
Brian Coca
e5ed49d6c7 added patch to workaround some s3 connection faliures 2015-03-26 11:23:32 -04:00
Brian Coca
f6c9d555a0 Merge pull request #976 from jsmartin/asg_doc_fix
Re-wording of feature.
2015-03-25 22:12:35 -04:00
Brian Coca
6570d48657 refactrored connection exception handling, added check to see if we actually get a connection before proceeding
Fixes #964
2015-03-25 21:40:13 -04:00
Sarah Zelechoski
43cd4ebd2e fix syntax in last example 2015-03-24 10:31:34 -04:00
James Martin
3bd2b7c8aa Re-wording of feature. 2015-03-20 14:59:34 -04:00
Toshio Kuratomi
5399f3744f Fix review comments from @bcoca in #745 2015-03-20 09:52:19 -07:00
Toshio Kuratomi
9e9fa6a451 Merge branch 'fix-ec2_asg' of https://github.com/m-o-e/ansible-modules-core into m-o-e-fix-ec2_asg 2015-03-20 09:43:05 -07:00
Toshio Kuratomi
a78de50801 Minor code formatting 2015-03-19 22:38:06 -07:00
Rowan Wookey
37412219d5 Fixed group name not being passed to wait_for_new_instances when replacing instances
Fixed group_name not being passed to wait_for_elb
Minor code clean up
2015-03-19 22:38:06 -07:00
James Martin
1c96ff32a1 check lb for instance healthy and some refactoring of rolling replace functions.
Optionally waiting for new instances to be in viable state on ASG creation/update.

Properly updating properties and terminating group.
2015-03-19 22:38:06 -07:00
Toshio Kuratomi
fb1c92ffa4 Merge pull request #724 from ferrants/devel-metric_alarm_fix
check keys is in dim2 before evaluating
2015-03-19 12:46:43 -07:00
Jaanus Torp
aca893cf43 Added support for tagging images in ec2_ami.py 2015-03-19 15:39:42 +00:00
whiter
6c1687e68e Added changed=True flag when new subnet groups created. Added conditional so that modify_db_subnet_group is only called when necessary and changed=True flag will be set. 2015-03-18 14:52:49 +11:00
Julien Syx
23fdba26b5 Fix the issue #931
Checking that the parameter doesn't exist. The old code had a bug when the parameter was 0.
2015-03-17 17:57:18 +01:00
Toshio Kuratomi
d65d04b3f8 Merge pull request #904 from ansible/ec2_vpc-sort
Sort subnets by the order they are specified in the play
2015-03-15 11:19:07 -07:00
Alex Rowley
7d6cd3baaa cloud/amazon/s3: update documentation
update description to show that module can do more than just put files into s3
2015-03-13 21:08:30 +00:00
Toshio Kuratomi
31cc5f543f Fix for py2.6 (no dict comprehensions on py2.6) 2015-03-11 19:07:55 -07:00
Toshio Kuratomi
8ed415589a Initialize the value of vpc_id variable 2015-03-11 18:40:05 -07:00
Brian Coca
07d5b50e2c Merge pull request #903 from h3biomed/allow_default_subnet
Allow vpc_subnet_id to remain unspecified (see bc0c169)
2015-03-11 14:46:59 -04:00
Brian Coca
df835f8be9 Merge pull request #924 from hkariti/route53_public_zones
Fix KeyError in public zones in route53
2015-03-11 13:57:33 -04:00
Toshio Kuratomi
974075277d Also don't fail if files are different and overwrite is false for uploads (this mimics copy and template).
Related to #489
2015-03-11 08:59:38 -07:00
Hagai Kariti
d65f9aa3af Fix KeyError in public zones in route53 2015-03-11 17:30:20 +02:00
Toshio Kuratomi
47c6dae9f3 Merge pull request #490 from pgehres/devel
Issue #489: s3 should not fail on checksum mismtach when overwrite=no
2015-03-11 08:22:23 -07:00
Toshio Kuratomi
edf1ac1ea6 Sort subnets by the order they are specified in the play
Fixes #172
2015-03-06 14:55:11 -08:00
Bret Martin
f16d8d9afb Allow vpc_subnet_id to remain unspecified (see bc0c169) 2015-03-06 14:59:27 -05:00
Jonathan Davila
19e7e99470 iam_policy 2015-03-03 15:23:06 -05:00
Toshio Kuratomi
9f38f6e6a2 Small code cleanup 2015-03-03 12:07:42 -08:00
Brandon W Maister
7f5aea980a 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.
2015-03-03 13:03:08 -05:00
Brian Coca
72b49f4c71 Merge pull request #846 from mlaccetti/devel
Change s3 to use connect_to_region
2015-03-03 08:51:35 -05:00
Michael Laccetti
5e7605475d Moving the import to the top of the file and getting rid of the redundancy
I sure do wish I knew where the whitespace change was coming from, though. Frustrating.
2015-03-02 20:12:54 -05:00
Feanil Patel
4a195c64f1 Compare DNS names case insensitively. 2015-03-02 10:59:14 -05:00
Trevor Pounds
07d562c58a Instance deregistration should try all associated ELBs. Fixes #869 2015-02-27 14:55:50 -08:00
James Cammarata
05904a7e17 Merge branch 'devel' of https://github.com/ansible/ansible-modules-core into devel 2015-02-27 11:01:46 -06:00
James Cammarata
db38d31f02 Updating version added fields for new alias parameters in route53 2015-02-27 11:00:21 -06:00
James Cammarata
49a493662a Merge branch 'route53-alias' of https://github.com/Coderah/ansible-modules-core into Coderah-route53-alias 2015-02-27 09:50:00 -06:00
James Cammarata
0c53b9033c Merge pull request #747 from barraponto/ec2_instance_info
Add ec2 instance tags and groups info
2015-02-27 09:41:08 -06:00
James Cammarata
fafb93490c Add private_zone parameter for route53
Fixes #473
2015-02-26 21:35:47 -06:00
Brian Coca
ec755796c0 Merge pull request #827 from bcoca/ec2_ami_handle_exceptions
now captures connection exceptions and returns in 'nicer' module failure
2015-02-25 10:37:43 -05:00
Michael Laccetti
60e2e43f00 Change s3 to use connect_to_region
* Allows us to use Ansible/s3 for GovCloud when accessing a pre-existing bucket
2015-02-25 08:46:13 -05:00
Toshio Kuratomi
c88259077e Merge pull request #698 from joelthompson/devel
ec2_group with purge_rules will purge too many rules.
2015-02-21 06:42:20 -08:00
Jens Carl
80da041eb6 - List the name servers of a zone. 2015-02-20 17:22:03 +00:00
Brian Coca
af31cb8faf now captures connection exceptions and returns in 'nicer' module failure 2015-02-20 09:28:11 -05:00
Bret Martin
bc0c1692b5 ec2: make group only match group names in this VPC 2015-02-19 11:28:13 -05:00
Brian Coca
53ef859ae4 fix instance=None documentation 2015-02-18 13:32:50 -05:00
Brian Coca
77241123a7 Revert "Revert "Don't use 'tenancy' in ec2 spot requests"" 2015-02-18 11:07:13 -05:00
Brian Coca
7c42182f47 Revert "Don't use 'tenancy' in ec2 spot requests" 2015-02-18 08:59:26 -05:00
Brian Coca
6c4804e413 Merge pull request #22 from teamdoug/devel
Pull SSL certificate IDs from existing ELBs
2015-02-16 18:49:37 -05:00
Luc Bourlier
df53b85259 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.
2015-02-10 13:43:11 +00:00
Capi Etheriel
5854f53cdc add ec2 instance tags and groups info 2015-02-09 18:46:20 -02:00
Coderah
aa2b1f033b add alias support to route53 module 2015-02-06 15:23:01 -08:00
Coderah
d92cd07156 add hosted_zone information to ec2_elb_lb return 2015-02-06 15:23:01 -08:00
Jean-Baptiste Barth
6090c4e109 Improve formatting after previous commit 2015-02-04 10:22:24 +01:00
Jean-Baptiste Barth
b451cbd37b 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.
2015-02-04 10:22:24 +01:00
moe
0d0205ad54 Woops, make collect/delete loop more efficient. 2015-02-04 06:13:52 +01:00
moe
047bd6f651 Fixes #744.
The following cases work for me now:
- Create new ASG with tags
- Update tags on ASG (create/change/delete)

In short, the module should now work as expected
wrt tagging. The previous code did not work at all
with latest boto for me (serialization errors) and
the logic was buggy anyway; e.g. removed tags
would never get deleted from ec2.
2015-02-04 05:56:19 +01:00
Raghu Udiyar
eab438ce5f Creating ami should be idempotent
If the ami already exists, return details of the duplicate
ami instead of failing with an error.
2015-01-31 14:12:56 +05:30
Matt Ferrante
e1f2c570eb check keys is in dim2 before evaluating 2015-01-29 16:36:35 -05:00
Brian Coca
e2083bbe8a corrected version added for latest features 2015-01-28 12:55:05 -05:00
Brian Coca
a28ad0db83 minor fixes on new rds refactor 2015-01-28 12:36:04 -05:00
Brian Coca
c5d7f07aa0 Merge pull request #5 from willthames/rds_refactor
Rds refactor
2015-01-28 12:34:12 -05:00
Joel Thompson
01c4ff922f Fixes issue 697 -- only purge the grants that need to be purged 2015-01-24 00:52:37 -05:00
Toshio Kuratomi
6f47416cec Merge pull request #641 from ansible/fix-640
Potential fix for 640
2015-01-22 21:45:10 -08:00
Phillip Holmes
c5cb352262 Merge branch 'devel' of https://github.com/ansible/ansible-modules-core into ansible-devel 2015-01-22 15:04:55 -06:00
Brian Coca
9e1847ed03 ec2 fix docs format 2015-01-21 20:09:46 -05:00
Doug Ellwanger
10aaa1137c Pull SSL certificate IDs from existing ELBs 2015-01-21 15:29:46 -08:00
Brian Coca
95d4b796c0 updated tenancy version added 2015-01-21 17:27:40 -05:00
Brian Coca
68a49bc6fb Merge pull request #4 from atlashealth/ec2_tenancy
Support for EC2 dedicated tenancy option
2015-01-21 17:18:34 -05:00
Jan Brauer
e2abbbefd7 Handle the case where a stack rollback fails. 2015-01-21 13:36:36 +01:00
Alex Clifford
df2088377b ttl should always be used during a delete 2015-01-20 10:43:22 +11:00
Brian Coca
0794597c7e corrected release when this feature was added 2015-01-19 09:34:27 -05:00
Toshio Kuratomi
6cbce4d911 Potential fix for 640 2015-01-13 22:39:20 -08:00
Alex Clifford
d2ae2e6cc6 Fix slight typo in doco 2015-01-14 12:12:02 +11:00
Brian Coca
0edfdca58b Merge pull request #105 from luisguilherme/devel
ec2_lc does not create valid launch configuration for EC2-Classic
2015-01-13 11:04:21 -05:00