Commit graph

13791 commits

Author SHA1 Message Date
Dag Wieers
fb442206ca Template role_params to avoid merging dict and unicode
This fixes #12915

Since combine_vars() is being run directly on role_params, we have to avoid merge_hash() to complain about merging a dict with a string (jinja template).
2016-02-19 01:57:23 +01:00
Dag Wieers
aeaddc5559 Backport combine_vars() logic from Ansible v2.0
While debugging I noticed that _validate_both_dicts() was evaluated twice through combine_vars (when merge_hash). Looking at v2.0 the logic was improved to not do _validate_both_dicts() twice in this case.

I also backported the 'update' behaviour as it looks more pythonic.
2016-02-18 16:48:15 +01:00
Dag Wieers
a935d61489 Improve efficiency of merge_hash
This commit improves 2 things:

- It makes merging empty dicts, or equal dicts faster
- It makes merging dicts faster (backported from v2.0)

I noticed that while debugging merge_hash a lot of merges related to empty dictionaries and sometimes identical dictionaries.
2016-02-18 16:03:54 +01:00
Brian Coca
92f387f681 backport fix for #12062 csvfile plugin strings 2016-02-12 17:30:55 -05:00
Brian Coca
4a043d5e82 switched threading to multiprocessing
both really work the same for the Lock but this hopefully will
avoid confusing people into thinking we are threaded or thread safe
Also did pyflakes cleanup and made note why checksums import exists
2016-02-11 22:19:41 -05:00
Brian Coca
d99955596e Merge pull request #13992 from electrofelix/accelerate-race
Fix race in accelerate connection plugin
2016-02-11 22:00:38 -05:00
Brian Coca
f48fef67bf Merge pull request #14253 from dagwieers/allow-key-auth-when-ask-pass
Allow key authentication when using `--ask-pass` (just like Ansible v2)
2016-02-11 01:45:13 -05:00
Brian Coca
051f4e5d3e Merge pull request #13697 from mvdbeek/stable-1.9
Set executable to None, fixes issue #13696
2016-02-11 01:43:10 -05:00
Toshio Kuratomi
f1db951a74 Merge pull request #14402 from ansible/no-log-diff-before-fix
Fix hiding of original value of files in diff output with no_log
2016-02-09 21:00:45 -08:00
Toshio Kuratomi
504c0e6201 Fix hiding of original value of files in diff output with no_log 2016-02-09 17:43:01 -08:00
Toshio Kuratomi
0cf0efa280 Add apt locale fix to changelog 2016-02-07 14:29:54 -08:00
Toshio Kuratomi
95b1f8b49b Update submodule refs to pick up apt locale fix 2016-02-07 14:29:29 -08:00
Toshio Kuratomi
28df3a0793 Add locale fixes to changelog 2016-02-07 13:11:46 -08:00
Toshio Kuratomi
cbcfa2df5e Update submodule ref for git locale fix 2016-02-07 13:10:36 -08:00
Toshio Kuratomi
43fdc6aee3 Allow setting run_command environment overrides for the life of an AnsibleModule 2016-02-07 13:07:28 -08:00
Toshio Kuratomi
f1033f2194 rework run_command's env setting to not change os.environ for the rest of the module.
New param to run_command to modify the environment for just this invocation.
Documentation and comment adjustments.
2016-02-07 13:05:16 -08:00
Toshio Kuratomi
3d7efff30c Update submodule refs 2016-02-05 10:33:56 -08:00
Toshio Kuratomi
dcce51853a Add changelog entry for no_log change 2016-02-05 09:50:26 -08:00
Toshio Kuratomi
42064446c4 Merge pull request #14339 from ansible/diff-no_log-fix
Fix --diff to respect no_log task parameter.
2016-02-05 09:39:04 -08:00
Toshio Kuratomi
0bcbcb20b0 Fix --diff to respect no_log task parameter. 2016-02-05 08:59:50 -08:00
James Cammarata
f0c1058b7b Merge pull request #14336 from dagwieers/fix-eval-json-booleans-1.9
Defined JSON booleans in global context for python eval()
2016-02-05 11:36:00 -05:00
Dag Wieers
b6e6c52b12 Defined JSON booleans in global context for python eval()
We define 'false', 'true' and 'null' as variables so that python eval() recognizes them as False, True and None.

This is a backport of a fix from 2.0.0.2 which also affects 1.9.4 (See issue #14291 and PR #14293)

This fixes #14291 for 1.9.4.
2016-02-05 17:24:48 +01:00
Toshio Kuratomi
ab0904d051 Merge pull request #14305 from dagwieers/patch-7
Double import sys, removed one
2016-02-04 07:02:19 -08:00
Toshio Kuratomi
5db11fae6e Merge pull request #14306 from dagwieers/patch-8
Double import tempfile, remove one
2016-02-04 07:01:19 -08:00
Dag Wieers
63b49a0025 Double import tempfile, remove one
tempfile was imported twice.
2016-02-04 14:16:18 +01:00
Dag Wieers
982bd28b34 Double import sys, removed one
sys was imported twice.
2016-02-04 14:11:29 +01:00
Dag Wieers
009164227e Allow key authentication when using --ask-pass (similar to Ansible v2)
This closes #14250.

It should not have any ill-effects for existing use-cases as we would only allow additional authentication methods on top of password authentication. And since the user can authenticate in other ways already, it also has no security impact.
2016-02-02 10:05:08 +01:00
Toshio Kuratomi
8e2c5337f5 Merge pull request #13808 from chouseknecht/chouse
Added --ignore-certs option to ansible-galaxy init, install and info …
2016-01-20 10:00:07 -08:00
chouseknecht
bb993f3aea Fix typo. 2016-01-20 12:55:35 -05:00
chouseknecht
007d05c4a1 Added note to 1.9.5 changelog regarding --ignore-certs, c option being added to allow work-around when behind a proxy server. 2016-01-20 12:50:58 -05:00
Darragh Bailey
1200a70879 Fix race in daemon initialize using delegate_to
Ensure only one thread can start up an accelerate daemon on a target
host where multiple hosts may be specified in the play, gather facts is
disabled and the first task delegates to the same target host.

This will slow down the initial connection to only allowing a single
thread setup a connection at a time, however this should be of a
negligible impact overall.
2016-01-19 12:44:23 +00:00
Darragh Bailey
3d4dc206a1 Prevent race in key setup for accelerate daemon
Ensure that initial setup in creating the key directory for ansible
accelerate mode keys, and generation/storage of the key for a
particular host are completed in a thread safe manner.

Creating directories/files and then assigning permissions and contents
to them means that paths may exist and satisfy the os.path.exists()
method in python for other threads before they are usuable.

Use a combination of locking around operations with use of unique named
files and an OS file system move to ensure that the conditions of
checking whether a file or directory exists, where it is potentially
created by another thread, will only succeed when the file has both the
correct contents and permissions.

Fixes #13850
2016-01-19 11:59:43 +00:00
chouseknecht
f2a32566d5 Added --ignore-certs option to ansible-galaxy init, install and info commands. 2016-01-11 18:15:24 -05:00
Tim Jones
1254b4391b Correctly parse dependency YAML dict 2016-01-11 16:50:38 +01:00
Marius van den Beek
cfd509d32e Set executable to None, fixes issue #13696 2015-12-30 14:32:10 +01:00
Brian Coca
b24daecd6e minor fix to become docs 2015-12-28 10:26:22 -05:00
Stephen Medina
7a91b05e84 clarify idempotence explanation
Small typo; wasn't sure what to replace it with.
2015-12-28 10:25:09 -05:00
Brian Coca
6e9f622856 updated release cycle to 4 months instead of 2 2015-12-27 14:17:20 -05:00
Branko Majic
9a856b04ea Adding documentation for the 'dig' lookup (#13126). 2015-12-21 13:49:56 -05:00
Brian Coca
ad47725713 allow for packaging to be in release tarball 2015-12-17 12:40:52 -05:00
Vytis Valentinavičius
e856ac2320 Added workaround for inventory directories 2015-12-15 15:50:58 +02:00
nitzmahone
54d4225e23 backport ansible_winrm_* kwarg support
fixes #13508
2015-12-14 17:08:56 -08:00
Brian Coca
64148a84ca Merge pull request #13454 from qduxiaoliang/issue
quit plays with an error if there were failed tasks and handler execu…
2015-12-13 00:18:30 -05:00
Toshio Kuratomi
13a6f03082 Update core submodule ref 2015-12-10 08:09:51 -08:00
Leon Xie
0da8c8bdd5 quit plays with an error if there were failed tasks and handler execution is forced 2015-12-07 16:48:11 +08:00
Brian Coca
ab18fd2171 added , back to inventory spliting 2015-12-05 01:07:12 -05:00
Toshio Kuratomi
5eeb4ef2b6 Update submodule refs 2015-12-04 10:02:27 -08:00
Toshio Kuratomi
85528e76b4 Note the fix to literal_eval in the changelog 2015-11-30 12:41:42 -08:00
Toshio Kuratomi
f59bd76972 Call the function :-)
Fixes #13330

Conflicts:
	lib/ansible/module_utils/basic.py
2015-11-30 12:40:15 -08:00
Brian Coca
309996504f actually writes info now
- also minor updates to error messages to be more informative
2015-11-22 08:39:02 -08:00