James Cammarata
ed7e17210e
Merge branch 'asnare-elb-internal' into devel
2014-05-21 08:59:49 -05:00
James Cammarata
7ef94428bf
Merge branch 'elb-internal' of https://github.com/asnare/ansible into asnare-elb-internal
2014-05-21 08:34:21 -05:00
James Cammarata
0f402bfb7d
Merge branch 'webmat-multi-word-mysql-grant-example' into devel
2014-05-21 07:50:55 -05:00
James Cammarata
4faff30ee0
Merge branch 'multi-word-mysql-grant-example' of https://github.com/webmat/ansible into webmat-multi-word-mysql-grant-example
2014-05-21 07:48:24 -05:00
James Cammarata
9f4f8a3c22
Merge pull request #7470 from bcoca/update_bin
...
now module searches for update-alternatives vs hardcoding it
2014-05-21 07:44:50 -05:00
Brian Coca
24f5030257
now module searches for update-alternatives vs hardcoding it
2014-05-20 22:51:27 -04:00
Andrew Snare
0cc6c479bc
Support internal-only ELBs in EC2.
2014-05-20 22:21:14 +02:00
James Cammarata
e36a8d466e
Don't re-query inventory when trimming failed/dark hosts
...
Since the filter list contains hosts, passing that back to list_hosts()
in the inventoy causes issues when the hostname is an IPv6 address
(with :'s interpreted as group unions). Since we already have the list
of hosts, we should not need to pass that back through inventory a
second time.
Fixes #7446
2014-05-20 14:58:37 -05:00
Mathieu Martin
a8969b5d3c
Add example 'Specify grants composed of more than one word' to the mysql_user module.
2014-05-20 14:41:18 -04:00
James Cammarata
365bfd732e
Don't use listify_ function, when all we want to do is template variables
...
This was causing a bug in the env module, due to the fact that we now
pass variables for the module through the templating engine combined
with the fact that we split-up the hostvars and setup variables. As a
result, if a variable in the env lookup had the same name as the variable
in Ansible, it would try and template itself over and over again until
the recursion limit would be hit, at which time an empty string was
returned.
Fixes #7396
2014-05-20 13:39:23 -05:00
James Cammarata
0ac74aaf59
Also set the environment variables when resetting the locale to C
2014-05-19 23:22:46 -05:00
James Cammarata
1f0be3753d
Merge pull request #7412 from bellkev/fix_skip_dir_inventory_extensions
...
Fix skip dir inventory extensions
2014-05-19 23:14:22 -05:00
James Cammarata
d44ed533b3
Default use_proxy to True for fetch_url()
...
Also added some error handling to the fetch_url() call in the
apt_repository module, so that failures to look up the PPA info
are properly handled.
Fixes #7322
2014-05-19 23:04:13 -05:00
James Cammarata
08406c0ee2
Adding the capability to proxy the ssl cert check
...
The ssl cert check will now respect the http and https proxy
environment settings. The url may also have the username/password
embedded, in which case basic auth will be used to connect to the
proxy server.
Fixes #7413
2014-05-19 16:00:32 -05:00
James Cammarata
285d9878ae
Reset locale to 'C' if the specified one is invalid
...
Fixes #7448
2014-05-19 10:26:06 -05:00
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
Kevin Bell
92bd755b47
Fixed extension filtering in InventoryDirectory
2014-05-14 23:43:14 -07:00
Kevin Bell
bcfef8d0d4
Add a broken test that shows extensions not skipped
2014-05-14 23:43:14 -07: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