Michael DeHaan
63505cd8b8
Merge pull request #7437 from mrdeathless/patch-1
...
Add missing space between var and delimeter
2014-05-18 22:38:06 -04:00
mrdeathless
856681a28d
Add missing space between var and delimeter
2014-05-17 16:43:23 +03:00
James Cammarata
cbea442ec2
Pull the link out of the alternatives output when not specified
...
Fixes #7414
2014-05-16 14:44:31 -05:00
James Cammarata
2128949a78
Merge branch 'mpeters-yum_module_typos' into devel
2014-05-16 09:25:42 -05:00
James Cammarata
923baa6772
Merge branch 'yum_module_typos' of https://github.com/mpeters/ansible into mpeters-yum_module_typos
2014-05-16 09:24:47 -05:00
James Cammarata
e3ee7787ed
Remove erroneous set of status_code causing a traceback in module uri
...
Fixes #7416
2014-05-16 08:49:08 -05:00
Michael Peters
15b3b42525
slight language change based on feedback from jimi-c
2014-05-16 09:44:32 -04:00
James Cammarata
a992dc88ba
Merge pull request #7428 from alanpearce/patch-1
...
Update composer example
2014-05-16 08:36:09 -05:00
Michael Peters
69923cc413
fixing some typos in the docs of the yum module
2014-05-16 09:22:12 -04:00
Alan Pearce
670068aaad
Update composer example
...
Remove unsupported 'install' argument
2014-05-16 14:06:55 +01:00
Michael DeHaan
b80b92e778
Stackdriver module was in the wrong category, so moving.
2014-05-16 08:30:38 -04:00
James Cammarata
2e8c940566
Merge pull request #7419 from mattjbray/docker-fix-selection-by-name
...
docker: fix targetting images by name
2014-05-15 09:55:46 -05:00
Matt Bray
8363ab5a6f
docker: fix targetting images by name
2014-05-15 15:04:30 +01:00
James Cammarata
2478028c55
Merge branch 'telsacolton-patch-1' into devel
2014-05-14 22:01:27 -05:00
James Cammarata
32ce085689
Merge branch 'patch-1' of https://github.com/telsacolton/ansible into telsacolton-patch-1
2014-05-14 21:48:31 -05:00
James Cammarata
df877f2e79
Check module_path permissions when creating ssh_wrapper for git
...
If the module directory is not writable/executable to the current user
(most likely because of a sudo to a non-root user), the ssh_wrapper
will be created in the default location for mkstemp() calls. To facilitate
the deletion of these new files, a new mechanism for cleaning up files
created by the module was also added.
Fixes #7375
2014-05-14 21:22:22 -05:00
Michael DeHaan
3b8a35d65e
Merge pull request #7406 from specnazzz/fix-python24
...
Fix known_hosts.py to work on older versions of python
2014-05-14 18:31:27 -04:00
telsacolton
06963c7826
Make file hardlink error message reasonble
...
When we hard-link a file, and the link path already exists, give the link path in the error message instead of the source
2014-05-14 16:54:26 -05:00
telsacolton
0d8104b8b7
Give reasonable error when symlink fails
...
When a symlink fails because the path already exists and force=no, we should output path in the error message instead of source.
2014-05-14 16:31:20 -05:00
James Cammarata
79731ce491
Evaluate changed_when only if task is not skipped
...
Fixes #7405
2014-05-14 16:04:37 -05:00
James Cammarata
67d8df0e32
During vsphere config check attempt cast before marking values missing
...
Fixes #7385
2014-05-14 15:57:26 -05:00
Michal Mach
60451c20ab
Fix known_hosts.py to work on older versions of python
2014-05-14 22:36:32 +02:00
James Cammarata
7faecd54b0
Merge pull request #7388 from jimi-c/issue_7384_vars_files_include
...
Pass vars_files on to included playbooks too
2014-05-14 14:52:33 -05:00
James Cammarata
154ef942eb
Merge pull request #7404 from jimi-c/issue_7363_docker_names
...
Make sure the docker data has a "Names" field before using it
2014-05-14 14:44:16 -05:00
James Cammarata
e623911df6
Merge branch 'bcoca-file_new_dirs_perms' into devel
2014-05-14 13:56:27 -05:00
James Cammarata
a9311a5dcb
Merge branch 'file_new_dirs_perms' of https://github.com/bcoca/ansible into bcoca-file_new_dirs_perms
2014-05-14 13:53:08 -05:00
James Cammarata
bf405ef7a8
Merge pull request #7400 from etehtsea/patch-1
...
Fix env splitting in docker module
2014-05-14 11:00:32 -05:00
James Cammarata
56515a38d5
Only chown on atomic move if the uid/gid don't match the src/tmp file
...
This is a corner case for remote file systems that don't support
chown() and where the source and destination for the atomic_move
are on that remote file system.
Fixes #7372
2014-05-14 09:59:12 -05:00
James Cammarata
02d9c328af
Merge branch 'ByteInternet-pass-basedir-to-runner-on-setup' into devel
2014-05-14 09:53:34 -05:00
James Cammarata
525e7339ed
Merge branch 'pass-basedir-to-runner-on-setup' of https://github.com/ByteInternet/ansible into ByteInternet-pass-basedir-to-runner-on-setup
2014-05-14 09:46:47 -05:00
James Cammarata
769962f837
Merge pull request #7399 from SirScott/postgresql_user_doc_touchup
...
postgresql_user module documentation: Clarify that the encrypted param must also be set.
2014-05-14 09:45:30 -05:00
James Cammarata
4e93b37abc
Merge pull request #7393 from jimi-c/issue_7387_role_conditionals
...
Properly merge role conditionals in with pre-existing conditionals
2014-05-14 09:15:26 -05:00
Konstantin Shabanov
ad9225895b
Fix env splitting in docker module
...
ENV variable value could contain '=' (for example mysql://host/db?pool=10)
2014-05-14 18:11:43 +04:00
Scott Sturdivant
726dc1d2e8
Clarify that the encrypted param must also be set.
...
While the encrypted parameter's documentation clearly states that it needs to
be set, if you are focused on the password parameter's documentation, there's
nothing to draw your attention to the fact that encrypted may also need to be
set.
2014-05-14 07:49:11 -06:00
James Cammarata
85bd6810bb
Pass vars_files on to included playbooks too
...
Fixes #7384
2014-05-14 08:37:47 -05:00
Allard Hoeve
c5833f9869
Add missing basedir to Runner in _do_setup_step
2014-05-14 15:22:02 +02:00
James Cammarata
360ffc4dfd
Properly merge role conditionals in with pre-existing conditionals
...
Fixes #7387
2014-05-14 01:45:35 -05:00
James Cammarata
19dbff916f
Correctly cast the size_gb value for vpshere disks
...
Fixes #7385
2014-05-13 15:13:13 -05:00
James Cammarata
187619c7fe
Use utils.combine_vars on vars_files data
...
Fixes #7345
2014-05-13 11:24:41 -05:00
James Cammarata
809b931640
Merge pull request #7382 from jimi-c/issue_7366_synchronize_inventory_dir
...
Do not base synchronize source on the inventory directory
2014-05-13 11:05:19 -05:00
James Cammarata
d75eb03080
Merge pull request #7380 from carsongee/cg/quantum_ip_subnet
...
Fix missing variable initialization so an unspecified internal_network works
2014-05-13 10:59:15 -05:00
James Cammarata
e17afa06ef
Merge branch 'marcore-devel' into devel
2014-05-13 09:28:48 -05:00
Carson Gee
e6fbd2d8cb
Fix missing variable initialization so an unspecified internal_network runs
2014-05-13 09:56:13 -04:00
Marco Re
712f4a631c
Update ssh.py
...
Convert to string to fix runtime error due to string concat in self.common_args += ["-o", "User="+self.user] when ansible_ssh_user is numeric
2014-05-13 11:29:19 +02:00
James Cammarata
41169666b0
Merge pull request #7373 from sivel/issue/7367
...
Handle ValueError during json.loads of json data from build
2014-05-12 14:22:14 -05:00
Matt Martz
92b77048dc
Handle ValueError during json.loads of json data from build
2014-05-12 14:16:07 -05:00
Chris Church
d725636469
Correctly initialize combined_cache for hosts if setup is skipped
...
Fixes #7364
2014-05-12 13:48:11 -05:00
James Cammarata
bfc1201ecd
Make sure the docker data has a "Names" field before using it
...
Fixes #7363
2014-05-12 12:27:07 -05:00
James Cammarata
38c2c60849
Do not base synchronize source on the inventory directory
...
Fixes #7366
2014-05-12 12:02:38 -05:00
James Cammarata
ba9ecb6ae6
Merge pull request #7371 from mwarkentin/devel
...
Retinafy favicon.ico
2014-05-12 11:12:38 -05:00