Commit graph

6175 commits

Author SHA1 Message Date
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
5983373f29 Merge pull request #1462 from sankalp-khare/ec2-vpc-module-documentation-typo-fix
Fixed a typo in ec2_vpc module documentation
2015-06-03 18:16:28 -04:00
Sankalp Khare
f9f17b5e04 Fixed a typo in ec2_vpc module documentation 2015-06-04 03:40:49 +05:30
Brian Coca
abcd276955 Merge pull request #963 from u2ix/devel
Allow to add build flags for gem installation
2015-06-03 08:54:00 -04:00
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
Brian Coca
eac87727c4 removed executable bit 2015-06-01 16:02:33 -07:00
Toshio Kuratomi
c700993dd5 Fix a problem introduced with #1101 and optimize privilege handling
* If a db user belonged to a role which had a privilege, the user would
  not have the privilege added as the role gave the appearance that the
  user already had it.  Fixed to always check the privileges specific to
  the user.
* Make fewer db queries to determine if privileges need to be changed
  and change them (was four for each privilege.  Now two for each object
  that has a set of privileges changed).
2015-06-01 15:59:26 -07:00
Tristan Fisher
fa9d2f56df removes bool type from validate. 2015-06-01 15:59:25 -07:00
Tristan Fisher
98061a8f33 standardizes bools in argument_spec 2015-06-01 15:57:59 -07:00
jaypei
823adbbe36 use the right way to unescape line string
Reference https://github.com/ansible/ansible/issues/10864
2015-06-01 15:53:45 -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
Matt Martz
2b5815efc9 Add compileall testing via travis to validate modules are python24 compatible 2015-06-01 15:26:50 -07:00
Toshio Kuratomi
8c10cc20ec Expand tildes and vars in the config file path 2015-06-01 15:24:15 -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
Will Thames
167e7c2b81 Perform privilege grants/revokes only when required
Use `has_table_privileges` and `has_database_privileges`
to test whether a user already has a privilege before
granting it, or whether a user doesn't have  a privilege
before revoking it.
2015-06-01 15:15:22 -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
Toshio Kuratomi
30fc6f03d6 Allow playbook specified login_user and login_password to override config file settings 2015-06-01 14:53:42 -07:00
James Cammarata
76c6a53274 Fix missing expanduser on chdir value 2015-06-01 14:51:57 -07:00
James Cammarata
6a63f2a6ba Command module changes for v2 compatibility 2015-06-01 14:51:57 -07:00
Toshio Kuratomi
f8d8af17cd Use a list comprehension instead of map and lambda 2015-05-29 18:55:32 -07:00
Toshio Kuratomi
474b731bcc Merge pull request #1036 from shr3kst3r/strip_spaces
Strip spaces around MySQL privileges before comparing to valid privileges
2015-05-29 18:49:03 -07:00
Toshio Kuratomi
f3277f0f1f Import ansible module_utils at bottom of file to not mess with line numbers in tracebacks 2015-05-29 13:37:47 -07:00
Toshio Kuratomi
00e54793a2 Merge pull request #1408 from Jmainguy/yum_http_el5
forces EL5 to fail if name=:// url style path to rpm
2015-05-29 13:32:58 -07:00
Jonathan Mainguy
7a5ad0c7f3 add :// url support for EL 5 2015-05-29 16:21:17 -04:00
Toshio Kuratomi
5983d64d77 Properly flip default for verifying server cert. Add nice error messages when the cert is invalid 2015-05-28 15:33:21 -07:00
Toshio Kuratomi
7fea93835c Change uri module to validate ssl certs by default 2015-05-28 15:05:00 -07:00
Benno Joy
217dc6b0b7 Merge pull request #1430 from wimnat/feature/uri-doc-update
Doc update to highlight use of body_type parameter
2015-05-28 11:10:13 +05:30
whiter
ba35cb8173 Doc update to highlight use of body_type parameter 2015-05-28 15:27:46 +10:00
Toshio Kuratomi
2b5e932cfb Fix for the new import code when password is empty 2015-05-27 20:28:19 -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
c80c471876 Merge branch 'stansonhealth-s3_retry' into devel 2015-05-27 07:04:59 -07:00
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
Brian Coca
44ef8b3bc6 Merge pull request #1426 from eest/service_openbsd_comments
service: Fix comments in OpenBsdService class.
2015-05-27 07:29:36 -04:00