Commit graph

328 commits

Author SHA1 Message Date
Andrea Mandolo
fe4884e8f0 Added some block_device_mapping (disks) informations to EC2 instance module ouput 2015-06-23 07:14:54 +02:00
Andrea Mandolo
2f8300087e Added "EC2 instance" termination_protection and source_dest_check changeability at run-time 2015-06-23 07:14:30 +02:00
Tom Paine
74d9f74536 Parse out space characters in route53 value list
Fixes: https://github.com/ansible/ansible-modules-core/issues/992
2015-06-22 14:52:45 +01:00
Brian Coca
dddb8f9df1 Merge pull request #1548 from freshbooks/ec2_vol_example_fixes
Indentation fix for with and register in the ec2_vol example
2015-06-19 13:08:01 -04:00
Colin Hutchinson
96d2c09457 Indentation fix for with and register in the ec2_vol example 2015-06-18 11:48:27 -04:00
Philip Kirkland
274abb96b1 adding 'encrypted' option into volume dict so ec2 module can easily include encrypted volumes 2015-06-17 14:33:37 +10:00
Benno Joy
351fca028f Merge pull request #1202 from nitzmahone/ec2_state_validation
Added choice validation for EC2 state arg
2015-06-17 07:54:13 +05:30
Brian Coca
898e338318 minor doc fixes 2015-06-16 18:56:24 -04:00
nitzmahone
fd7bbc9eba Added choice validation for state arg
fixes traceback on invalid state arg
2015-06-16 13:42:44 -07:00
Benno Joy
8a998ae76f Merge pull request #1465 from hkariti/ec2_vol_delete_race_condition
ec2_vol: fix race condition when deleting a volume
2015-06-16 10:52:42 +05:30
Greg DeKoenigsberg
28a869a030 Updating cloud modules with proper github author information 2015-06-15 14:41:22 -04:00
Brian Coca
05a2ef106f Merge pull request #326 from preo/ec2-eip-refactor
Refactor and improve the EC2 Elastic IP module.
2015-06-15 10:05:28 -04:00
Brian Coca
1d7e80499b Merge pull request #324 from preo/ec2-vpc-sg-param-check
Validate Security Group rule parameter names for ec2_group module.
2015-06-15 09:45:17 -04:00
Tyler Cross
de617bb3ae Get specific object version with S3 module.
- allow specifying version for mode=get and mode=getstr
- when version specified doesn't exist give an error message that indicates so
2015-06-15 07:43:29 -04:00
Robert Estelle
942f0ce96c Fix missing instance_id param in ec2_eip. 2015-06-14 16:11:33 -04:00
Robert Estelle
063d3d97c6 Remove unnecessary wait_timeout parameter. 2015-06-14 16:11:33 -04:00
Robert Estelle
c36e8947bc Refactoring of ec2_eip module. 2015-06-14 16:11:28 -04:00
Robert Estelle
17c1fa0872 ec2_eip - PEP8 and minor style cleanups. 2015-06-14 16:01:49 -04:00
Robert Estelle
9b7de40922 EC2 Security Group - Validate parameters. 2015-06-14 15:35:41 -04:00
Brian Coca
acfa1b4c39 Merge pull request #1464 from qrtt1/devel
Prevent s3 module getting the memory-error from uploading or downloading a large file
2015-06-12 13:53:50 -04:00
Brian Coca
7f12130d7a fixed version added 2015-06-12 10:39:47 -04:00
Brian Coca
20b1593ae0 Merge pull request #418 from amandolo/ec2_ami_module
Add "block_device_mapping" parameter on EC2_AMI Amazon module
2015-06-12 10:34:06 -04:00
Benno Joy
9fb4a2ee5c Merge pull request #914 from Jimdo/add_sns_notifications_to_cloudformation
Add support for SNS notification ARNs in CloudFormation
2015-06-12 20:01:31 +05:30
Soenke Ruempler
bb8e9563cf Add support for SNS notification ARNs in CloudFormation 2015-06-12 14:34:18 +02:00
Andrea Mandolo
0b0d972998 Add "block_device_mapping" parameter on EC2_AMI Amazon module (DOCUMENTATION) - upgraded 2015-06-12 09:07:27 +02:00
Andrea Mandolo
1e4bd62af5 Add "block_device_mapping" parameter on EC2_AMI Amazon module - ugraded 2015-06-12 09:03:29 +02:00
Bruce Pennypacker
51bc602f42 Added delobj command to delete an object within a bucket 2015-06-11 13:43:15 +00:00
Benno Joy
e7203514ea Merge pull request #870 from tpounds/fix-issue-869
Instance deregistration should try all associated ELBs. Fixes #869
2015-06-10 18:15:55 +05:30
Benno Joy
85e9ccd17b Merge pull request #1030 from jsmartin/asg_rolling_optimizations
ec2_asg: Streamlined rolling udpate algorithm.
2015-06-10 17:44:06 +05:30
Benno Joy
b9d0185cd8 Merge pull request #959 from wimnat/hotfix/issue-958
Fixes rds_subnet_group never reports changed
2015-06-10 08:39:19 +05:30
toninog
fccc925ec5 fixes to code to enable updates of user to groups and delete groups. Fixed example yaml to use groups 2015-06-09 15:27:15 +01:00
Brian Coca
92a4512b0b Merge pull request #887 from defionscode/iam_policy
iam_policy
2015-06-09 09:59:05 -04:00
Benno Joy
2562f72183 Merge pull request #859 from tpounds/fetch-asg-elbs
Use auto scaling group managed ELBs if present.
2015-06-09 10:01:02 +05:30
Trevor Pounds
4b9b047878 Use auto scaling group managed ELBs if present. 2015-06-08 21:24:57 -07:00
Benno Joy
c25fe3438b Merge pull request #737 from raags/devel
Creating ami should be idempotent
2015-06-09 09:07:05 +05:30
Alex Gandy
b91a232fe6 Added volumes dict to ec2_lc example 2015-06-08 12:01:27 -04:00
Benno Joy
f5bafe2463 Merge pull request #355 from h3biomed/route_table_tags
ec2_vpc module: add route table resource tagging
2015-06-08 19:04:54 +05:30
toninog
9f3658d901 Fixed bug in example where updating a user to a group
Fixed bug in create_group and update_group whereby paramaters were not being set correctly.
2015-06-08 13:55:24 +01:00
Hagai Kariti
fb4732fad2 ec2_vol: fix race conditions because we handle errors before actually deleting
Just try to delete the volume and handle the error amazon sends
2015-06-07 10:16:33 +03:00
Brian Coca
32102f7e69 Merge pull request #1472 from bennojoy/fix_11177
fix for 11177 where module readds rule even if the rules exists
2015-06-05 19:09:18 -04:00
Brian Coca
fc255fbd21 minor doc fixes 2015-06-05 14:09:02 -04:00
Brian Coca
cae1f30e95 Merge pull request #756 from defionscode/iam_module
iam_module
2015-06-05 13:58:50 -04:00
Jonathan Davila
801a5e8ed0 iam module with fixes
iam module. fix policy issue.

bugfix

allow for modifying path without declaring new_path
2015-06-05 13:51:27 -04:00
Brian Coca
f5ff5ba348 reverting pep changes that were breaking documentation 2015-06-05 12:01:10 -04:00
Ching Yi, Chan
1517ae8ab2 Refactoring for easier to read 2015-06-05 23:29:11 +08:00
Brian Coca
837bd04f95 minor doc fixes 2015-06-05 10:25:25 -04:00
Brian Coca
182e7c7fc6 made non exec 2015-06-05 10:19:41 -04:00
Brian Coca
37ecabbf6a Merge pull request #1137 from timmahoney/elasticache_subnet_group_management
Elasticache subnet group management
2015-06-05 10:12:24 -04:00
Benno Joy
6b9e9fe05d fix for 11177 where module readds rule even if the rules exists 2015-06-05 12:31:59 +05:30
Tim Mahoney
8c13ac894a Elasticache Subnet Group 2015-06-04 14:40:05 -04:00
Ching Yi, Chan
ed5ea7e921 Prevent memory-error from a large file 2015-06-04 14:28:57 +08:00
Sankalp Khare
f9f17b5e04 Fixed a typo in ec2_vpc module documentation 2015-06-04 03:40:49 +05:30
Brian Coca
273abeb8ee Merge pull request #1435 from civisanalytics/cloudformation_yaml
cloudformation: accept local templates in yaml format
2015-06-03 08:52:10 -04:00
billwanjohi
61741b60c6 cloudformation: accept local templates in yaml format
Since the YAML data format is a subset of JSON, it is trivial to convert
the former to the latter. This means that we can use YAML templates to
build cloudformation stacks, as long as we translate them before passing
them to the AWS API. I figure this could potentially be quite popular in
the Ansible world, since we already use so much YAML for our playbooks.
2015-06-02 21:11:25 +00:00
tedder
b138411671 feature pull request: catch and retry recoverable errors
boto can throw SSLError when timeouts occur (among other SSL errors). Catch these so proper JSON can be returned, and also add the ability to retry the operation.

There's an open issue in boto for this: https://github.com/boto/boto/issues/2409

Here's a sample stacktrace that inspired me to work on this. I'm on 1.7, but there's no meaningful differences in the 1.8 release that would affect this. I've added line breaks to the trace for readability.

    failed to parse: Traceback (most recent call last):
      File "/home/ubuntu/.ansible/tmp/ansible-tmp-1419895753.17-160808281985012/s3", line 2031, in <module> main()
      File "/home/ubuntu/.ansible/tmp/ansible-tmp-1419895753.17-160808281985012/s3", line 353, in main download_s3file(module, s3, bucket, obj, dest)
      File "/home/ubuntu/.ansible/tmp/ansible-tmp-1419895753.17-160808281985012/s3", line 234, in download_s3file key.get_contents_to_filename(dest)
      File "/usr/local/lib/python2.7/dist-packages/boto/s3/key.py", line 1665, in get_contents_to_filename response_headers=response_headers)
      File "/usr/local/lib/python2.7/dist-packages/boto/s3/key.py", line 1603, in get_contents_to_file response_headers=response_headers)
      File "/usr/local/lib/python2.7/dist-packages/boto/s3/key.py", line 1435, in get_file query_args=None)
      File "/usr/local/lib/python2.7/dist-packages/boto/s3/key.py", line 1488, in _get_file_internal for bytes in self:
      File "/usr/local/lib/python2.7/dist-packages/boto/s3/key.py", line 368, in next data = self.resp.read(self.BufferSize)
      File "/usr/local/lib/python2.7/dist-packages/boto/connection.py", line 416, in read return httplib.HTTPResponse.read(self, amt)
      File "/usr/lib/python2.7/httplib.py", line 567, in read s = self.fp.read(amt)
      File "/usr/lib/python2.7/socket.py", line 380, in read data = self._sock.recv(left)
      File "/usr/lib/python2.7/ssl.py", line 341, in recv return self.read(buflen)
      File "/usr/lib/python2.7/ssl.py", line 260, in read return self._sslobj.read(len) ssl.SSLError: The read operation timed out
2015-06-01 16:09:20 -07:00
Feanil Patel
fbaeee5dba Output the Internet Gatewoy id directly instead of in a dict. 2015-06-01 15:52:39 -07:00
Benno Joy
4e206e3790 Fixes issue 1197 for s3 module, where the file gets downloaded even if checksums match 2015-06-01 15:52:39 -07:00
Feanil Patel
d796e8f54f Tell me what the igw id is if we created an igw. 2015-06-01 15:47:26 -07:00
xiaclo
1fb035a346 Update route53.py 2015-06-01 14:53:42 -07:00
xiaclo
2aa793ec0e Fix issue #1156
Fix as suggested in the issue.

https://github.com/ansible/ansible-modules-core/issues/1156
2015-06-01 14:53:42 -07:00
Benno Joy
415815ef45 Merge pull request #678 from Jimdo/handle-cfn-rollback-failure
Handle the case where a Cloudformation stack rollback fails.
2015-05-27 22:45:33 +05:30
billwanjohi
40eef6c3ec s3 put: add support for server-side encryption
- added 'encrypt' boolean option
- reordered module options alphanumerically
2015-05-27 16:00:01 +00:00
Benno Joy
57c8547a3b Merge pull request #1333 from wimnat/feature/issue-1332
rds module now will exit gracefully when resource=none
2015-05-27 19:59:33 +05:30
Toshio Kuratomi
5f9592248a Minor fixups found during review of #582 2015-05-27 07:03:29 -07:00
Toshio Kuratomi
dcc04f9505 Merge branch 's3_retry' of https://github.com/stansonhealth/ansible-modules-core into stansonhealth-s3_retry
Conflicts:
	cloud/amazon/s3.py
2015-05-27 06:55:33 -07:00
Jonathan Davila
e2773f7554 author fix 2015-05-27 08:37:39 -04:00
whiter
71ad56b151 Fix for issue #1332 - when instance is has finished deleting and get_db_instance returns None, exit gracefully 2015-05-26 15:12:00 +10:00
Benno Joy
784589eede Merge pull request #1414 from wangqiang8511/issu_fix_1302
Do instance update after add tags to instance.
2015-05-25 07:56:55 +05:30
Wang Qiang
31f3319b56 Do instance update after add tags to instance. 2015-05-25 09:25:11 +08:00
marko
5f5be7bc2a Added support for foreign security groups (Fixes: #373) 2015-05-22 12:34:41 +02:00
Brian Coca
150b71f11a removed executable bit 2015-05-21 07:01:08 -04:00
Jonathan Mainguy
3a294c3379 fixes example documenation 2015-05-21 09:07:23 -04:00
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