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
Jonathan Davila
e2773f7554
author fix
2015-05-27 08:37:39 -04: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
Patrik Lundin
fb41bdfc1e
service: Fix comments in OpenBsdService class.
...
No functional change.
2015-05-27 08:05:30 +02:00
Jonathan Mainguy
41049042de
remove blank lines from htpasswd file
...
used standard mktemp()
2015-05-26 19:06:54 -04:00
Brian Coca
7a6f532020
Merge pull request #1423 from ercpe/mysql_db-debugging
...
Improved output of mysql_db plugin
2015-05-26 18:59:00 -04:00
Toshio Kuratomi
476af93e96
Merge pull request #1358 from Jmainguy/mysql_user_dots
...
observe ` in privileges_unpack
2015-05-26 15:32:01 -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
Jonathan Mainguy
db9ab9b262
escapeds changes
...
fixed merge conflict
remove uneeded regexs
arrays
2015-05-26 18:23:51 -04:00
Brian Coca
898f47e557
stat doc fix
...
fixes #1371
2015-05-26 15:22:56 -04:00
Toshio Kuratomi
2c7c23e8e7
Merge pull request #1262 from bobobox/feature-fix-rds-mysql-revoke
...
mysql_user: Only revoke actually granted permissions, not 'ALL'.
2015-05-26 11:04:54 -07:00
Robin Miller
cda7a9be15
Replaced lambda functions with list comprehensions.
2015-05-26 12:56:08 -05:00
Robin Miller
74b7ce9dcf
Only revoke actually granted permissions, not 'ALL'.
...
This prevents errors when the login_user does not have 'ALL'
permissions, and the 'priv' value contains fewer permissions than are
held by an existing user. This is particularly an issue when using an
Amazon Web Services RDS instance, as there is no (accessible) user with
'ALL' permissions on *.*.
2015-05-26 12:56:08 -05:00
Robin Miller
48c83a0d9d
Merge remote-tracking branch 'upstream/devel' into devel
2015-05-26 12:55:48 -05: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
Brian Coca
d02ef57815
minor doc fix
2015-05-26 13:43:29 -04:00
Brian Coca
0c9dd0e6a4
Merge pull request #751 from j2sol/service_must_exist
...
Add service option to avoid failure on missing service
2015-05-26 13:39:08 -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
Brian Coca
0e572aa3f4
Merge pull request #1422 from bcoca/wait_time_delay_sleep
...
sleep when only doing a time delay to avoid cpu churn
2015-05-26 12:18:35 -04:00
Brian Coca
6d088169ef
Merge pull request #1348 from devjatkin/issue_1230
...
fix apt to handle virtual packages correctly
2015-05-26 11:55:44 -04:00
Brian Coca
0d41af23c2
Merge pull request #909 from bcoca/apt_return_cacheinfo
...
added updated cache time to apt, also started documenting return values
2015-05-26 11:54:03 -04:00
Brian Coca
7810a898e8
sleep when only doing a time delay to avoid cpu churn
2015-05-26 10:58:39 -04:00
Johann Schmitz
8892aa2bf4
Improved output of mysql_db plugin
...
Show error number and error description on connect error to ease debugging.
2015-05-26 16:13:40 +02:00
Brian Coca
1736c8dfea
Merge pull request #1399 from SUSE/devel
...
Add SLE12 support to hostname.py
2015-05-26 10:08:52 -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
Toshio Kuratomi
d74187438f
Merge pull request #1417 from fdupoux/mysql-db-use-python-pipelines
...
Decompress mysql dumps on the fly using python subprocess …
2015-05-25 18:15:54 -07:00
fdupoux
380b122d5a
Refactoring to avoid duplication of code which manages the decompression of database dumps in various formats
2015-05-25 20:22:49 +01:00
fdupoux
f634c10636
Simplify code which prepares the decompression command
2015-05-25 20:10:12 +01:00
Toshio Kuratomi
32e609720a
Refactor dump compression and use get_bin_path for finding the compressors
2015-05-25 09:22:08 -07:00
fdupoux
1e2ce363f7
Decompress mysql dumps on the fly using python subprocess during an import to simplify operation
2015-05-25 13:40:15 +01:00
Benno Joy
29f4a5a1ed
Merge pull request #1407 from Jmainguy/service_check_ubuntu
...
fixes check mode for Ubuntu 14.04
2015-05-25 08:13:29 +05:30
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
Jonathan Mainguy
442b6a2067
fixes check mode for Ubuntu 14.04
2015-05-22 21:28:36 -04:00
Ryan Walls
3f679933a6
Add support for --log-driver option that docker released with Docker 1.6
2015-05-22 16:36:38 -06:00
James Cammarata
b5399d3446
Re-reverting windows modules PR #384
2015-05-22 13:28:24 -05:00
Benno Joy
51fa223a0d
Merge pull request #1398 from markocelan/devel
...
Added support for foreign security groups (Fixes : #373 )
2015-05-22 17:26:41 +05:30
Vladislav Lewin
771b369005
add SLE12 support to hostname.py
2015-05-22 13:26:25 +02: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
Toshio Kuratomi
16d83e9e1a
Merge pull request #1392 from br0ziliy/fix-add-state-to-easy-install-pull-request
...
Fix "_is_package_installed() takes exactly 4 arguments, 3 provided"
2015-05-21 15:55:24 -07:00
Vasyl Kaigorodov
f0dc27227c
Fix "_is_package_installed() takes exactly 4 arguments, 3 provided" error
2015-05-21 23:24:20 +02:00
Toshio Kuratomi
0877aae3fe
Merge pull request #1383 from schlueter/add-state-to-easy_install
...
Add state to easy_install
2015-05-21 11:07:00 -07:00
Schlueter
1030cb48a7
Add 'version_added' to state documentation for easy_install resource
2015-05-21 12:54:48 -04:00
Schlueter
17544062ec
Correct reference to gem in easy_install resource
2015-05-21 12:49:43 -04:00
Schlueter
02cd8489c1
Add Documentation
2015-05-21 12:23:05 -04:00
Schlueter
3bae8bda10
Use standard if statement to check state in easy_install resource
2015-05-21 12:16:26 -04:00