Commit graph

1540 commits

Author SHA1 Message Date
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
James Cammarata
3256db99e2 Fixing digital_ocean documentation and a bug in os_subnet 2015-06-01 15:34:16 -07:00
Toshio Kuratomi
55d48a7a82 Finish up cleanups to modules:
* Add python>= 2.6 to documented requirements when a module's deps need
  python>= 2.6 so we know when a module can use python2.6+ syntax
* Remove BabyJSON usage
* Change modules to use if __name__ == '__main__' so that they can
  potentially be unittested

The BabJSON changes Fixes #1211
2015-06-01 15:34:16 -07:00
Brian Coca
145361aea3 Revert "Add deprecated documentation for _quantum_subnet"
cause it was already added

This reverts commit 3fa32c4984.
2015-06-01 15:24:15 -07:00
Toshio Kuratomi
9927e109b7 Add deprecated documentation for _quantum_subnet 2015-06-01 15:22:37 -07:00
Brian Coca
4348475ed3 doc fixes 2015-06-01 15:06:42 -07:00
David Shrewsbury
3692518643 Update os_subnet module for latest shade
Shade can now handle creating, updating and deleting subnets.
This cleans up the module to take advantage of that.
2015-06-01 15:03:44 -07:00
David Shrewsbury
abbf8a40ca Rename os_subnet to os_subnet.py 2015-06-01 15:03:44 -07:00
Monty Taylor
ef1c7eef5b Add OpenStack Subnet module
Also deprecated old quantum_subnet module
2015-06-01 14:59:14 -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
Benno Joy
bd7e3fc8ab Merge pull request #841 from billwanjohi/encrypt-s3-object
Encrypt s3 object
2015-05-27 22:15:24 +05:30
Brian Coca
92c823c69a Merge pull request #1378 from aioue/patch-4
Update vsphere_guest.py
2015-05-27 12:20:20 -04:00
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
Toshio Kuratomi
0ab2f81d4f Merge pull request #1411 from AndrewPashkin/add_docker_api_version_argument_to_docker_image
Add 'docker_api_version' to docker_image
2015-05-26 15:28:14 -07:00
Brian Coca
58c6c3dd03 Merge pull request #1046 from emonty/feature/os_network
Add OpenStack Network module
2015-05-26 13:46:28 -04:00
Toshio Kuratomi
ce4cc0282a Merge pull request #1394 from j2sol/feature/os_server_actions
Add an openstack servers actions module
2015-05-26 10:35:35 -07: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
Andrew Pashkin
27c174128b Add 'docker_api_version' to docker_image
By default docker-py uses latest version of Docker API. This is not
always desireable, and this patch adds option to specify version, that
should be used.
2015-05-23 23:17:30 +03:00
marko
5f5be7bc2a Added support for foreign security groups (Fixes: #373) 2015-05-22 12:34:41 +02:00
Jesse Keating
a14aee5239 Add an openstack servers actions module
This module supports a few of the server actions that are easy to
initially impiment. Other actions require input and provide return
values in the API calls that will be more difficult to impliment, and
thus are not part of this initial commit.
2015-05-21 16:19:57 -07:00
Tom Paine
3183ab6da1 Update vsphere_guest.py
Add mounted ISO image to examples.
2015-05-21 12:52:52 +01: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
Monty Taylor
6606e4f68d Add OpenStack Network module
Also, deprecate the old quantum network module
2015-05-20 11:41:24 -07:00
Tom Paine
ed07502587 Update vsphere_guest.py
Add example distributed virtual switch example so vm_nic options are clearer.
2015-05-20 16:01:29 +01:00
Brian Coca
5011593ee3 fixed typo on novaclient var 2015-05-19 10:52:48 -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
Brian Coca
627593b43a Merge pull request #1347 from octplane/add_dockerfile_parameter
Support optional dockerfile name
2015-05-18 11:51:28 -04:00
Pierre Baillet
06e3ac7bf4 Support optional dockerfile name 2015-05-18 16:51:12 +02: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