Commit graph

13759 commits

Author SHA1 Message Date
Toshio Kuratomi
8785f9fc3c Merge pull request #14652 from alexandrem/fix_role_vars_precedence_interpolation
Fix bug where extra vars highest precedence is violated when used ins…
2016-03-07 13:44:29 -08:00
Brian Coca
46ae226607 avoid running assemble on check mode
fixes #14175
2016-03-07 16:01:38 -05:00
Toshio Kuratomi
26eb9a8bb9 Update core submodule for pip fix 2016-03-07 11:42:47 -08:00
Toshio Kuratomi
ae36d35595 Add pip fix to changelog 2016-03-07 11:42:04 -08:00
Brian Coca
c3b874755f avoid extra info being passed into mode
only permission info is valid
2016-03-04 14:48:57 -05:00
Toshio Kuratomi
8494d3867c Merge pull request #13556 from xytis/inventory_dir
fix loading host/group vars when inventory is directory and using --limit
2016-03-04 11:03:18 -08:00
Toshio Kuratomi
b11f2a0267 Merge pull request #13802 from TimJones/tj-fix-issue-13800
Correctly parse dependency YAML dict
2016-03-04 10:58:04 -08:00
Brian Coca
402e375698 Merge pull request #14619 from dagwieers/patch-10
Check for closing sequence before templating
2016-03-04 13:32:17 -05:00
Brian Coca
d2bd6604b0 Merge pull request #14713 from chouseknecht/galaxy1.9_paging
Fix bug 14715: Galaxy CLI paging error
2016-02-29 22:43:47 -05:00
chouseknecht
41d6531fe7 Fix bug 14715: Galaxy CLI paging error 2016-02-29 21:17:50 -05:00
Alexandre Mclean
0358d473ba Fix bug where extra vars highest precedence is violated when used inside an interpolation within another variable
Extra vars lose their precedence when they overwrite a variable inside another variable interpolation structure.

Fixes #10896
2016-02-24 22:54:23 -05:00
Brian Coca
ca98e74251 Merge pull request #14622 from dagwieers/remove-v2-references
Remove references to v2 codebase
2016-02-23 09:36:24 -05:00
Dag Wieers
bfff091a9e Remove references to v2 codebase 2016-02-23 14:15:32 +01:00
Dag Wieers
edf3164bc7 Check for closing sequence for templating (Ansible v1.9)
This fixes #14573 for Ansible v1.9.
2016-02-23 11:42:48 +01:00
James Cammarata
a05df837aa Merge pull request #14565 from dagwieers/fix-role_params-merge_hash
Template role_params to avoid merging dict and unicode
2016-02-22 11:11:32 -05:00
Dag Wieers
ccbc849b20 Merge branch 'stable-1.9' of github.com:ansible/ansible into fix-role_params-merge_hash
Implement new fix from @jimi-c
2016-02-22 17:08:42 +01:00
James Cammarata
f36896b2bb Merge pull request #14562 from dagwieers/combine_vars_backport
Backport combine_vars() logic from Ansible v2.0
2016-02-22 10:39:09 -05:00
Brian Coca
1e0cf69b1c Merge pull request #14559 from dagwieers/merge_hash
Improve efficiency of merge_hash (Ansible v1.9)
2016-02-20 12:39:23 -05:00
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