Commit graph

5144 commits

Author SHA1 Message Date
tedder
c5fe40661d 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
2014-12-29 17:19:12 -08:00
Toshio Kuratomi
19b328c4df Cannot readlink() on a hard link 2014-11-19 13:04:44 -08:00
Toshio Kuratomi
c46f39f044 Fix git module checking out correct version after initial clone
Fixes #313
2014-11-19 12:30:24 -08:00
Toshio Kuratomi
195e7c5a13 Merge commit '383ecdb' into devel 2014-11-18 13:09:29 -08:00
Toshio Kuratomi
383ecdb50b Correct variable name 2014-11-18 13:08:26 -08:00
Brian Coca
6a31e30076 Merge pull request #333 from hfinucane/apt-dkpg-downgrade
If force=true, ignore python-apt's advice
2014-11-18 15:01:03 -05:00
Brian Coca
ee39fd8df0 Merge pull request #124 from jonhadfield/remove-unused-creates
Remove redundant check for creates argument.
2014-11-18 14:59:11 -05:00
Brian Coca
d868b6d366 Merge pull request #343 from bcoca/service_systemd_fix
service now detects systemd is actually running, not just installed
2014-11-17 16:14:03 -05:00
Brian Coca
f49120598f service now detects systemd is actually running, not just installed 2014-11-17 15:03:49 -05:00
Toshio Kuratomi
0941c9490c Merge pull request #342 from Jmainguy/user_el5
fixes user module for rhel5 by using -n instead of -N
2014-11-17 10:29:41 -08:00
Jonathan Mainguy
8b8008569f fixes user module for rhel5 by using -n instead of -N, all other distros will still use -N 2014-11-17 13:26:08 -05:00
Brian Coca
2c1538f220 Merge pull request #259 from IndyMichaelB/docfix
docfix for vsphere_guest.py
2014-11-17 09:48:23 -05:00
Michael Baydoun
8e10fbf5f3 Merge branch 'docfix' of github.com:IndyMichaelB/ansible-modules-core into docfix 2014-11-16 17:02:02 -05:00
IndyMichaelB
5a628aacd4 docfix for vsphere_guest.py
Corrected parameter name from user to username in documentation
2014-11-16 16:59:57 -05:00
Sam Kottler
7b875dbda5 Remove trailing whitespace in digital_ocean_domain 2014-11-15 16:21:07 -05:00
Sam Kottler
b493bd9a0d Merge pull request #336 from skottler/cleanup/65/remove-unsupported-states
digital ocean: Remove unsupported states
2014-11-15 16:15:31 -05:00
Nejc Zupan
6f6eca5b4e digital ocean: Remove unsupported states 2014-11-15 16:12:46 -05:00
Henry Finucane
ce02d59651 If force=true, ignore python-apt's advice
This lets you downgrade packages, for instance.
2014-11-14 16:27:20 -08:00
Toshio Kuratomi
fb4854ebcb Fix retrieval of package version in apt module 2014-11-14 10:01:30 -08:00
Toshio Kuratomi
c389cd671f Documentation update for apt version wildcards from bryanlarsen 2014-11-14 09:43:38 -08:00
Toshio Kuratomi
c6522620c5 Clean up the docker module just a little so that we can unittest the get_split_image_tag function 2014-11-14 08:46:32 -08:00
Toshio Kuratomi
6be2fbb1c5 Merge pull request #323 from ansible/apt-wildcard
Build on mvo5's pull request to implement apt version wildcard
2014-11-14 07:49:33 -08:00
Toshio Kuratomi
0c312e417a Moving unittests to the main ansible repo for now 2014-11-14 07:45:56 -08:00
Toshio Kuratomi
e1ecc5ca8e Update package_status and install to account for wildcarded versions. 2014-11-14 07:45:56 -08:00
Toshio Kuratomi
ccedf0dd40 Decide to allow pkgname and version wildcards so that things like libxml2*=2.9* would work 2014-11-14 07:45:56 -08:00
Toshio Kuratomi
bc18c9dc78 Cache pkg name list so we don't recreate the list for every package 2014-11-14 07:45:56 -08:00
Toshio Kuratomi
10fd0f7073 Just make things a little more readable 2014-11-14 07:45:56 -08:00
Toshio Kuratomi
3e7ffc3210 Correct trivial spelling. 2014-11-14 07:45:55 -08:00
Toshio Kuratomi
885b60f31f if __name__ does work with ansible modules 2014-11-14 07:45:55 -08:00
Michael Vogt
f475769d3a add apt unittest 2014-11-14 07:45:55 -08:00
Michael Vogt
76fc436b08 Allow foo=1.0* like expressions in apt 2014-11-14 07:45:55 -08:00
Brian Coca
4bc1e46de2 Merge pull request #24 from sysadmind/devel
Added note to files/synchronize module about synchronizing two directori...
2014-11-13 19:44:24 -05:00
Brian Coca
3d57fd5db7 Merge pull request #319 from preo/remove-executable-permissions
Remove incorrect executable permissions on scripts.
2014-11-13 18:24:34 -05:00
Robert Estelle
4dd099fe7a Remove incorrect executable permissions. 2014-11-13 18:08:48 -05:00
Brian Coca
01a15aec21 Merge pull request #317 from maxamillion/admiller/fix-gce_net-fw-example
fix gce_net add firewall rule example
2014-11-13 16:36:46 -05:00
Adam Miller
01db13e3ad fix gce_net add firewall rule example 2014-11-13 15:27:10 -06:00
Brian Coca
04680ce228 Merge pull request #286 from bcoca/hostname_24_compatible
made hostname work with python 2.4
2014-11-13 12:39:01 -05:00
Brian Coca
9fb3fb76e7 Merge pull request #303 from bcoca/wait_for_exlude_fixes
minor fixes to wait_for to avoid tracebacks
2014-11-13 12:38:19 -05:00
Brian Coca
a1797628c5 Merge pull request #311 from bcoca/apt_state_fix
Apt state fix
2014-11-13 12:27:37 -05:00
Brian Coca
c96f44c183 Merge pull request #314 from johnpbatty/devel
Fix get_flavor_id() when flavor_ram is specified
2014-11-13 09:08:38 -05:00
John Batty
08b2752080 Fix get_flavor_id() when flavor_ram is specified
Without this fix, _get_flavor_id() fails to find a matching flavor if
both:
* the flavor_ram parameter is specified
* the first flavor in the list does not match.

The bug is simply that the module.fail_json() call lies within the loop
iterating through the flavors.  This call should only be made if the
loop completes and no matching flavors have been found.
2014-11-13 13:26:20 +00:00
Brian Coca
a13c568310 corrected comparisson which had accidentally chaned in previous fixes 2014-11-12 17:16:02 -05:00
Brian Coca
bbebdefacb better handling of deprecated aliases 2014-11-12 17:01:14 -05:00
Brian Coca
3a967c8005 Merge pull request #290 from ctrlaltdel/devel
Fix a typo in nova_compute documentation string
2014-11-12 16:33:57 -05:00
Brian Coca
1622e3b2df Merge pull request #284 from borgified/devel
typo in comments: of -> or
2014-11-12 16:33:20 -05:00
Brian Coca
5356ccbb35 make sure 'present' is fully equivalente of 'installed' and remove installed from
feedback in favoer of 'present'
2014-11-12 15:46:36 -05:00
James Cammarata
a7749a8fce Merge pull request #309 from jsmartin/asg_fix_delete
asg will now be terminated if state=absent.
2014-11-12 13:16:49 -06:00
James Martin
341c7ce307 asg will now be terminated if state=absent.
adds mutually exclusive options
2014-11-12 12:44:03 -05:00
James Cammarata
710b7b9aba Merge pull request #308 from jsmartin/asg_orphaned_code
Removes orphaned code.
2014-11-12 11:16:06 -06:00
James Cammarata
ae744f98d8 Serialize tag attributes to ASG properties in ec2_asg
Fixes #108
2014-11-12 11:04:43 -06:00