Commit graph

10217 commits

Author SHA1 Message Date
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
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
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
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
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
James Cammarata
bdbb3bb4a1 Fixing unit tests for synchronize due to earlier changes 2014-04-14 21:13:14 -05: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
Michael DeHaan
f61900158c Merge pull request #6943 from fxkr/merge-test-module-allow-yaml-in-command-line-parameter
Make test-module interpret --args='{...' as yaml.
2014-04-14 11:39:21 -04:00
Michael DeHaan
eb1b4892b2 Merge pull request #6944 from ex-nerd/patch-1
Explain how to do multiple paths in roles_path
2014-04-14 11:38:24 -04:00
Michael DeHaan
b45123b77c Merge pull request #6950 from sam-at-github/patch-1
What particular script?
2014-04-14 11:34:59 -04:00
Michael DeHaan
537320774a Merge pull request #6952 from nousdefions/devel
Added example demonstrating other functionality
2014-04-14 11:32:44 -04:00
Michael DeHaan
874aa2bb23 Merge pull request #6954 from rasputnik/patch-1
fix typo
2014-04-14 11:29:29 -04:00
Michael DeHaan
bc2b4174a5 Merge pull request #6956 from mattjbray/docker-1-10-volumes-from-dns
docker: from API 1.10 dns and volumes_from should be passed to start()
2014-04-14 11:29:10 -04:00
Michael DeHaan
9210a96825 Merge pull request #6965 from mjschultz/fix-6964
cloud/elasticache: Ensure self.data is iterable
2014-04-14 11:17:54 -04:00
Michael DeHaan
20d4749dbc Merge pull request #6969 from sivel/rax-inventory-fix-empty-group
Fix empty group name in rax.py output
2014-04-14 11:15:33 -04:00
Michael DeHaan
4f9dafd394 Merge pull request #6970 from nZac/doc-jinja-join-filter
Add reference to the join filter.
2014-04-14 11:14:56 -04:00
Michael DeHaan
691d67c4a4 Merge pull request #6971 from ciupicri/fix-manpage
Fix typos in ansible-playbook man page source
2014-04-14 11:14:24 -04:00
Cristian Ciupitu
7cb4b7ab89 Fix typos in ansible-playbook man page source
Note: the man page needs to be rebuilt.
2014-04-14 01:22:18 +03:00
Nick Zaccardi
a6c00989d1 Add reference to the join filter. 2014-04-12 21:26:08 -04:00
Matt Martz
21a2d32ffc Fix empty group in rax.py output 2014-04-12 15:57:59 -04:00
Michael J. Schultz
db92301b00 cloud/elasticache: Ensure self.data is iterable
- self.data['SecurityGroups'] can return None causing traceback, if that
  is the case fallback to an empty list
2014-04-11 18:23:53 -05:00
Matt Bray
71b5a11735 docker: from API 1.10 dns and volumes_from should be passed to start() 2014-04-11 17:08:55 +01:00
Dick Davies
ae0cb241a2 fix typo 2014-04-11 16:48:51 +01:00
James Tanner
b0556ab1fb Addresses #6702 Remove version_added from description string 2014-04-11 11:18:05 -04:00
Jonathan Davila
6a6ade830e Added example demonstrating other functionality 2014-04-11 11:14:40 -04:00
James Tanner
42fbbd0502 Addresses #6702 set version_added for rsync_opts 2014-04-11 11:04:05 -04:00
jctanner
bb3ce0c744 Merge pull request #6702 from jjshoe/devel
Allow you to pass in arbitrary rsync options
2014-04-11 10:43:14 -04:00