Joshua Conner
4defd9a15a
docker: exclude 'entrypoint' from comparing 'command' param with containers
...
The JSON the Docker API returns includes the container's ENTRYPOINT value (if it has one) with the 'Command' value. So instead of checking if `container['Command'] == module.params['command']`, we just check that `container['Command'].endswith(module.params['command'])` so the entrypoint won't affect a container being properly classified as matching the module params or not.
Also I refactored a super-long `if` statement into some temporary variables - I did it to help me figure out what was going wrong, and then it makes the code more readable so I kept it.
2014-04-17 16:10:53 -07:00
Joshua Conner
10171dc42b
docker: send 1.10 params if docker-py is new enough version
2014-04-17 16:05:50 -07:00
Michael DeHaan
632eb18333
Merge pull request #7044 from 42wim/devel
...
hint to install python-ssl on redhat systems
2014-04-17 18:34:39 -04:00
Wim
6ed4ca97a8
hint to install python-ssl on redhat systems
2014-04-18 00:07:07 +02:00
Taylor Barstow
154055e9ff
Fixing expectations in test_dir_inventory_groups_for_host
2014-04-17 16:41:49 -04:00
James Cammarata
1ef0402f03
Make sure a default allow out rule exists if no other egress rules do
...
Fixes #7027
2014-04-17 15:24:18 -05:00
Chad Nelson
ef1a8e4cdd
Only update submodules when recursive is true
2014-04-17 09:34:36 -04:00
Michael DeHaan
09e0d1c51f
Merge pull request #7029 from mattjbray/docker-api-error
...
docker.client.APIError has moved to docker.errors.APIError
2014-04-16 22:38:40 -04:00
Andreas Fleig
337a0059d9
apt_key: fix key lookup for 64 bit key ids
...
Fixes #7018 by extending `all_keys` to work with either short or long keys.
Also removes the ununsed method `key_present`.
2014-04-17 03:51:19 +02:00
Matt Bray
3948dc2d1d
docker.client.APIError has moved to docker.errors.APIError
...
see 18d4db09ec
2014-04-16 23:42:56 +01:00
Andrew Newdigate
761e1c0daa
Added additional error checking to avoid HTTP400 responses from ansible.
2014-04-16 23:00:01 +01:00
Andrew Newdigate
2ed83b9d70
Removing unused code
2014-04-16 22:44:34 +01:00
Andrew Newdigate
265d9adbb9
Merge branch 'devel' of github.com:ansible/ansible into devel
...
Conflicts:
library/monitoring/pagerduty
2014-04-16 22:43:01 +01:00
James Cammarata
a37a84243b
Check resource_tags value before using it in ec2_vpc
...
Fixes #7024
2014-04-16 12:21:32 -05:00
Brian Brazil
8ec400669f
Fix race conditions where a process gets in state "Running"
...
between the restart/start command and the summary command.
Refactor to avoid repeating the status, and fail if a given call to monit fails.
2014-04-16 18:04:19 +01:00
Paul Durivage
f0bb3aeeea
Add Docker inventory plugin
2014-04-16 11:27:36 -05:00
James Cammarata
36b9bc4d40
Merge pull request #7021 from smoothify/skipped-items
...
skipped callback in loop does not display 'item'.
2014-04-16 11:22:57 -05:00
James Cammarata
f9eb0ba4ad
Merge branch 'devel' of https://github.com/evanccopengeo/ansible into evanccopengeo-devel
2014-04-16 10:24:39 -05:00
jjshoe
5258f75789
apt_key lists all keys in uppercase
...
allow for a little user error
2014-04-16 10:06:59 -05:00
smoothify
48bf7a000d
Try to pass in item to on_skippped callback.
2014-04-16 15:40:07 +01:00
James Cammarata
c5e9a06c2a
Merge pull request #7011 from hernandesbsousa/devel
...
Add missing info for the append option for user module
2014-04-16 09:20:09 -05:00
Michael Heca
a1706e6411
module replace - report changed only if contents is changed
2014-04-16 09:25:56 +02:00
Hernandes B. de Sousa
202fc57253
Add missing info for the append option
...
Both 'default' and 'choices' options were missing at the documentation.
2014-04-16 01:22:12 -03:00
James Cammarata
e8b33636ae
Get the bin path for commands in the unarchive module
...
Fixes #6927
2014-04-15 20:39:22 -05:00
Michael DeHaan
a5e7492c4f
This test appears OS specific, so disabling for now.
2014-04-15 20:21:50 -04:00
Michael DeHaan
8d060685fa
Merge pull request #7007 from tima/test-sudo-cmd-esc
...
Fixed escaping of " in test_make_sudo_cmd in TestUtils so that it passes as it should.
2014-04-15 19:56:16 -04:00
Timothy Appnel
fd35c59fc1
Fixed escaping of " in test_make_sudo_cmd in TestUtils so that it passes
...
as it should.
Signed-off-by: Timothy Appnel <tim@appnel.com>
2014-04-15 19:35:53 -04:00
Michael DeHaan
a12231fabe
Merge pull request #7000 from adammenges/quick-doc-fix
...
Added homebrew to install doc
2014-04-15 19:28:53 -04:00
danfaizer
7867335702
Added Abiquo inventory plugin
2014-04-16 00:36:38 +02:00
evanccopengeo
ac64f3c8cf
cleaning up the code a bit more
2014-04-15 18:16:34 -04:00
evanccopengeo
88b30a74d2
fixing bug where if both private_ip and assign_public_p are set ansible fails out
2014-04-15 17:55:26 -04:00
Adam Menges
a039146081
added homebrew to install doc
2014-04-15 13:15:43 -07:00
James Cammarata
f547733b1f
Check to make sure the firewalld client is connected before proceeding
...
Fixes #6911
2014-04-15 15:03:52 -05:00
James Cammarata
d240d073eb
Changing SSL cert detection method to allow for auto-negotiation of SSL protocols
...
Fixes #6904
2014-04-15 13:45:21 -05:00
James Cammarata
23c5f4524d
Make sure args in run_command are encoded for shlex.split calls on py2.6
2014-04-15 13:04:41 -04:00
James Cammarata
d494a163f9
Merge pull request #6900 from jimi-c/issue_6891_cifs_mount_hang
...
Add a timeout decorator for timing out functions that may hang
2014-04-15 11:21:29 -05:00
James Cammarata
ba1a6c2e11
Removing .orig file merged in accidentally
2014-04-15 10:58:53 -05:00
James Tanner
aad128bac7
Use combined cache for templating module vars
...
Fixes #6901
2014-04-15 10:56:48 -05:00
James Cammarata
942c3299ec
Merge pull request #6997 from ricard33/patch-1
...
Fixed test on 'cached' parameter.
2014-04-15 10:17:35 -05:00
Cédric RICARD
3384021fe6
Fixed test on 'cached' parameter.
...
'cached' parameter is boolean, not string
2014-04-15 16:41:27 +02:00
Ton Kersten
6735733ed1
Fix documentation error
2014-04-15 09:21:41 +02:00
James Cammarata
bdbb3bb4a1
Fixing unit tests for synchronize due to earlier changes
2014-04-14 21:13:14 -05:00
Chris Conway
0ec5d78e20
Modifies match/search filter examples to use non-trivial regexes.
2014-04-14 16:50:30 -07:00
Joe Fiorini
2a3514b60b
Support hosts without private ip without errors
...
Not all Linode hosts have a private ip. This fixes an actual error that was happening because the generated list of private ips is empty when there isn't one.
2014-04-14 19:05:44 -04:00
Joshua Conner
0ef288dcc8
Docker: don't send wrong parameters to client.start()
...
As part of being updated for the 1.10 API, a couple of parameters were passed to the docker.client.start() command that it doesn't accept. This caused the module to error out if it tried to start any Docker containers. This removes those parameters so the module works again.
2014-04-14 15:05:42 -07:00
James Cammarata
40b958e348
Don't turn complex args back into a k=v string for the synchronize module
...
Fixes #6951
2014-04-14 16:35:16 -05:00
James Tanner
6ec0e25d1a
Addresses #6908 Add a mode parameter to apt_repository
2014-04-14 16:42:23 -04:00
James Tanner
28cb4756c4
Remove debug line
2014-04-14 16:02:08 -04:00
James Cammarata
2cc4ac2e75
Catch traceback caused by permissions errors during a local md5 sum
...
Fixes #6948
2014-04-14 12:41:21 -05:00
James Tanner
db36c41c3b
Addresses #6908 Strip usernames and passwords from apt_repository filenames
2014-04-14 13:18:21 -04:00