ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity
33288 commits 10 branches 167 tags 272 MiB
Commit graph

862 commits

Author SHA1 Message Date
Toshio Kuratomi
5ed7a55990 Restore json import for redis as well. Switch preference to simplejson for speed 2014-12-23 13:14:14 -08:00
Nathan Cahill
6d785ca081 support variables with dashes - fixes #9786 2014-12-16 20:58:38 -07:00
Nicolas Rémond
3cf0c09ce9 Variables lookup in a template should handle properly the undefined case 2014-12-12 12:11:17 +01:00
Brian Coca
97408fe5b2 Revert "Make listify respect the global setting for undefined variables." 
This 'mostly' reverts commit 2769098fe7.

Conflicts:
	lib/ansible/utils/__init__.py
	test/units/TestUtils.py
 2014-12-04 09:14:53 -05:00
Brian Coca
e938f554b7 better exception handling for unexpected exceptions 2014-12-04 08:01:38 -05:00
Brian Coca
f2b853f7a0 changed plugin load priority to be path based, not suffix based. 2014-12-01 17:36:57 -05:00
Brian Coca
9a5cbf747a fine tuned lookup/templating errors 2014-11-26 22:06:37 -05:00
Brian Coca
db145a368d now only flattened ignores failonundefined cause of it's special need 2014-11-25 16:12:15 -05:00
Brian Coca
e3feb104c3 fixes issues with listyfing failing too often 2014-11-25 15:55:53 -05:00
Brian Coca
7d2937b1cc minor fixes to template function 
- make sure it calls itself correctly, now passes same params as it recieves
- vars is reserved, changed for templatevars to avoid confustion
- forcing mustaches again since the removal broke 'listification' as per #9622
- fixes incorrectly successful tests using undefined var, now it is defined
- now returns empty list if items is None to avoid errors
 2014-11-25 12:59:13 -05:00
Toshio Kuratomi
c4c3cc315d Transform both values of a task name into a byte str prior to comparing 
Fixes #9571
 2014-11-19 11:50:02 -08:00
Toshio Kuratomi
25607e5cf4 When run in FIPS mode, allow vault to fail only when using legacy format 2014-11-17 16:38:56 -08:00
Brian Coca
395952329a Merge pull request #9529 from sivel/env-nested-modules 
Support nested modules with ANSIBLE_LIBRARY env var
 2014-11-12 10:59:18 -05:00
Toshio Kuratomi
9a7eb57718 Some changes to FIPS compat since SLES implements it differently 2014-11-11 20:23:03 -08:00
Toshio Kuratomi
6a85f3ebc7 Add comments/docstrings not to use md5 unless forced to by forces outside our control. 2014-11-10 12:01:44 -08:00
Matt Martz
4c2d06d2fe Support nested modules with ANSIBLE_LIBRARY env var 2014-11-10 10:52:23 -06:00
Toshio Kuratomi
f1267c0b05 Move from md5 to sha1 to work on fips-140 enabled systems 2014-11-06 21:28:04 -08:00
Brian Coca
b3b356480d added the ability to keep aliased and deprecated modules prefixed with 
'_', they will be loaded after non prefixed modules are checked they can
be full modules or symlinks to existing ones (alias)

also updated ansible doc to ignore these, will eventually add selective
display
 2014-10-27 15:54:41 -07:00
James Cammarata
9ee3cd14ee Fix typo in vault edit helper code 
Fixes #9399
 2014-10-22 11:08:01 -05:00
Toshio Kuratomi
3d135f98d1 Small python3 compat in vault to keep code in sync with v2 2014-10-21 10:32:25 -04:00
Toshio Kuratomi
da9d87b1d4 Make vault file creation use a tempfile 2014-10-21 00:32:08 -04:00
James Cammarata
b61a78532c Catch template syntax errors specifically when templating strings 
Fixes #9333
 2014-10-20 13:11:20 -05:00
Toshio Kuratomi
48a308a87c Allow both old-style and new-style role dependencies to be valid. 
Fixes #9173
 2014-10-09 02:48:47 -04:00
Toshio Kuratomi
c75aeca435 Merge removal of complex_args_hack 2014-10-08 15:03:43 -04:00
Toshio Kuratomi
a10d10f647 Workaround more python-2.6 shlex not being able to handle unicode strings 2014-10-08 14:30:36 -04:00
Chris Church
8fb88be41b Simpler fix for module suffixes than c02e8d8c8. 2014-10-08 11:53:06 -04:00
Rob Howard
2769098fe7 Make listify respect the global setting for undefined variables. 
(Fixes #9008.)

With credit to jimi-c for the initial pass in this commit:
b18bd6b98e
 2014-10-08 13:47:11 +11:00
James Cammarata
05644686de Fix bug in plugin path caching 
Fixes #9263
 2014-10-04 21:47:38 -05:00
Toshio Kuratomi
cef2a8795f Make dynamic inventory return byte str, not unicode 2014-10-02 20:27:06 -04:00
James Cammarata
d99e4f15c8 Merge pull request #9220 from jlaska/devel 
Resolve issue where repo_path contains multiple '.git' strings
 2014-10-01 14:23:23 -05:00
Toshio Kuratomi
0af750e3e5 Merge pull request #9182 from bbasleeper/feature_sudo_exe_from_inventory 
Add a new inventory parameter (ansible_sudo_exe) to specify sudo command...
 2014-09-30 14:55:46 -04:00
James Cammarata
05994cd900 Don't clear paths when adding a new directory path in PluginLoader 2014-09-30 09:43:40 -05:00
James Laska
684352926b Resolve issue where repo_path contains multiple '.git' strings 
If the repo_path contained multiple '.git' strings, the _git_repo_info()
call resulted in a traceback.  This change removes the trailing '.git'
and resolves the traceback.
 2014-09-30 10:33:42 -04:00
Michael DeHaan
c02e8d8c80 Don't search powershell modules unless using the winrm connection. 2014-09-28 12:17:03 -04:00
Michael DeHaan
3908d50b03 Tolerate no module search path. 2014-09-28 12:10:36 -04:00
Michael DeHaan
1d17881960 Add module search path to --version output. 2014-09-28 11:39:04 -04:00
Michael DeHaan
21c3784a43 If submodules are not found, don't error out. 2014-09-28 11:25:04 -04:00
Will Thames
952a36920c Cater for uninitialized submodules 
Output a useful message if `git submodule update --init --recursive` not
yet performed

```
$ ansible --version
ansible 1.8 (submodule_ansible_version 59ae596484) last updated 2014/09/28 13:20:51 (GMT +1000)
  lib/ansible/modules/core: (detached HEAD 617a52b20d) last updated 2014/09/28 13:15:25 (GMT +1000)
  lib/ansible/modules/extras:  not found - use git submodule update --init lib/ansible/modules/extras
```
 2014-09-28 11:25:04 -04:00
Will Thames
d1476aeb01 Updated version info to include submodule information 
`ansible --version` etc. now include information about submodules

```
ansible 1.8 (submodule_ansible_version ffee9a8fe0) last updated 2014/09/28 11:03:14 (GMT +1000)
  lib/ansible/modules/core: (ec2_snapshot_remove 3a77c31ecb) last updated 2014/09/27 18:23:31 (GMT +1000)
  lib/ansible/modules/extras: (detached HEAD 110250d344) last updated 2014/09/27 14:33:42 (GMT +1000)
```

Also improved handling of detached HEAD when printing out version
information.
 2014-09-28 11:25:04 -04:00
Bruno BAILLUET
a25da4af05 Add a new inventory parameter (ansible_sudo_exe) to specify sudo command path. 2014-09-27 17:39:49 +02:00
Michael DeHaan
e5116d2f9b changes for package loading of modules 2014-09-26 11:25:56 -04:00
Michael DeHaan
25cc79e2db Modules is a package. 2014-09-26 10:55:00 -04:00
James Cammarata
128c10b311 Don't template 'vars' dictionary during templating 
Fixes #9132
 2014-09-25 14:46:16 -05:00
James Cammarata
889dfc4374 Merge pull request #8959 from willthames/galaxy_ssh_clone 
Allow fairly common ssh repo clone path to work
 2014-09-23 14:58:29 -05:00
James Cammarata
9d45f3a65e Before decrypting check if vault password is set or error early 
Fixes #8926
 2014-09-19 15:10:30 -05:00
James Cammarata
b376e208c7 Adding "follow" param for file/copy options 
Also modifies the template action plugin to use this new param
when executing the file/copy modules for templating so that links
are preserved correctly.

Fixes #8998
 2014-09-16 12:05:55 -05:00
Michael DeHaan
d6e6d2a6ca Remove regex related to baby-JSON parsing only. 2014-09-11 13:30:10 -04:00
Michael DeHaan
26cdddaebf Tracebacks are now catchable with ignore_errors and have streamlined output. Also removes 'baby-JSON' for bash modules. 2014-09-11 12:27:21 -04:00
Will Thames
d6a725659e Allow github style ssh repo names 2014-09-10 21:55:27 +10:00
Will Thames
537472f42c Make ansible-galaxy work as expected 
This change fixes hg galaxy roles
Roles also get installed if roles path is missing, which
the tests currently require (fixes #8950)
 2014-09-10 09:16:30 +10:00
Niko Felger
fa74a5c806 Fixing issue with symlinked vaults 2014-09-08 16:10:18 +02:00
James Cammarata
8cc3543918 Re-allow templating of complex_args, but count params to prevent injection 
Fixes #8810
 2014-09-05 14:24:05 -05:00
James Cammarata
04da466c7b Fixing up serialize_args utility function 2014-08-27 10:20:07 -05:00
James Cammarata
e99db078b4 Additional fixes for the new omit parameter variable 2014-08-27 10:06:55 -05:00
Victor Lin
559c04f324 Implement omit for module args, also add tests for it 2014-08-27 10:04:47 -05:00
Victor Lin
0b4d7f1574 Implement default omit filter 2014-08-27 10:03:07 -05:00
James Cammarata
811ff49f78 Updating CHANGELOG for new symbolic mode feature and updating file docs 2014-08-25 23:47:41 -05:00
y_nk
affdadda25 handling case of space in path (given would start with single quote) 2014-08-25 21:26:47 +05:30
Michael DeHaan
8a0045baad Update tests for ansible-galaxy CLI additions. 2014-08-22 14:01:15 -04:00
Michael DeHaan
d87830e1cc Merge branch 'galaxy_github_archive' of git://github.com/willthames/ansible into devel 
Conflicts:
	lib/ansible/utils/__init__.py
 2014-08-22 13:58:50 -04:00
James Cammarata
d01188033f Checking for localized versions of the su password prompt 
Fixes #8681
 2014-08-22 09:59:40 -05:00
Michael DeHaan
0286c31e85 Assume master branch for downloads if not specified. 2014-08-22 10:01:13 -04:00
Michael DeHaan
0cd40fc372 Remove debug 2014-08-22 09:58:27 -04:00
Will Thames
850963790d Allow roles to be installed from archives on github 
Ensure that the automated scm determination for github.com
repos still copes with .tar.gz archive files.

Handling .zip archives is left as an exercise for the interested reader
 2014-08-22 10:06:21 +10:00
Michael DeHaan
bcb44276fe Assume github.com URLs are git protocol if not specified. 2014-08-21 17:15:23 -04:00
Michael DeHaan
68e21aa4b0 Add comments about what these new functions do. 2014-08-21 17:15:23 -04:00
Will Thames
6e9abefc11 Corrected bug where role_path was wrong for roles in subdirectories 
Fixed role name for
    - { role: 'lives/in/a/subdirectory' }
Should be 'lives/in/a/subdirectory', not just 'subdirectory'
 2014-08-21 17:15:23 -04:00
Will Thames
ada9074276 Allow installation of roles from yaml roles file 
Added docs
Added more tests
Improved how roles are returned from the parsers
 2014-08-21 17:15:23 -04:00
Will Thames
46b59b02ed Friendly Role Names and roles from URLs 
* Roles can now be given a friendly name as third field in role spec csv
* Roles can be installed from URL (not just from archived SCMs)
* Integration tests to demonstrate this
* Unit tests to ensure that role spec parsing works as expected
 2014-08-21 17:15:23 -04:00
Will Thames
4803e923ff Improved handling of role_version in repo_url_to_role_name 2014-08-21 17:15:23 -04:00
Will Thames
c2fe33f9f4 Tidied up a little, added tests 
Moved repo_url_to_role_name to common method in ansible.utils
Added unit test for repo_url_to_role_name
Added integration tests for galaxy
 2014-08-21 17:15:23 -04:00
James Cammarata
bae73e5793 Merge branch 'alozovskoy-alozovskoy-debug-ascii-patch' into devel 2014-08-21 15:57:43 -05:00
James Cammarata
4fafd3baa8 Add error checking around json.dumps when not forcing ascii mode 2014-08-21 15:52:36 -05:00
James Cammarata
b81e77cfec Tweak error language in dict validation 2014-08-21 13:24:53 -05:00
Serge van Ginderachter
b8d057296a variable merging: detect if both vars are really dicts when combining/merging dicts 2014-08-21 18:06:02 +02:00
James Cammarata
8a1fbed5d6 Correct variable blending from vars_files with hostvars in them 
Fixes #8638
 2014-08-20 15:49:01 -05:00
James Cammarata
379e31883c Fix check mode issues with copy module 
Fixes #8639
 2014-08-18 16:02:45 -05:00
Michael DeHaan
99c39b1ff3 By popular request, make the no_log attribute also censor tasks from callbacks. 2014-08-12 13:36:05 -04:00
Jakub Paweł Głazik
99a339fa7b Fix comments and error message 2014-08-11 16:02:10 -04:00
Jakub Paweł Głazik
58feee0f45 ansible-vault view - new command 2014-08-11 16:02:10 -04:00
Josh Drake
aa419044c4 WIP on the re-implementation of fact caching and various backends. 2014-08-11 12:23:05 -04:00
Michael DeHaan
fb5a1403dd Merge 2014-08-11 12:22:55 -04:00
James Cammarata
25e9d1197e Merge branch 'optimise_utils_clean_data' of https://github.com/leth/ansible into leth-optimise_utils_clean_data 2014-08-11 10:21:02 -05:00
Marcus Cobden
c47d1f5265 Pre-load whole string and use seek to alter tags 2014-08-11 09:10:06 +01:00
Marcus Cobden
c8bfd157f8 Switch cStringIO to StringIO for unicode support 
The performance difference isn't too bad
 2014-08-11 08:48:37 +01:00
Marcus Cobden
84114e5c0b Fix copy/paste error 2014-08-11 08:43:40 +01:00
Marcus Cobden
ef65d3dbf6 Optimise string handling in ansible.utils._clean_data 2014-08-09 23:47:08 +01:00
James Cammarata
63bf2f6d9a Preserve all line breaks in literal blocks 
Fixes #8512
 2014-08-08 12:11:15 -05:00
Michael DeHaan
8c4161d4a1 Merge branch 'retf_py' of git://github.com/berendt/ansible into devel 
Conflicts:
	lib/ansible/inventory/vars_plugins/group_vars.py
	plugins/callbacks/mail.py
 2014-08-08 12:17:37 -04:00
Michael DeHaan
48a0236ec6 Merge pull request #6619 from sergevanginderachter/ansible_version_var 
Introduce an ansible_version dict as runner variable
 2014-08-08 11:20:17 -04:00
James Cammarata
a45c3b84f3 Avoid templating raw lookup strings 2014-08-06 13:25:14 -05:00
Alexander Lozovskoy
5165dfa2df Issue with printing unicode non-english characters #8425 patch 2014-08-06 12:38:14 +04:00
Michael DeHaan
1c6398dd3b Resolve option conflict differently. 2014-08-05 20:45:16 -04:00
Michael DeHaan
b4b115cd13 File common arguments should not be used in all docs pages. 2014-08-05 20:45:16 -04:00
Michael DeHaan
4312391e0a (A) Fix a bug in the doc generator that was clobbering the force parameter for the copy module. 
(B) This is a work in progress but the idea is to have text snippets where we can respond to tickets with a bit more helpful info.
Not active just yet.
 2014-08-05 20:10:15 -04:00
James Cammarata
6d94ae64ec Remove unnecessary unicode conversions from parse_kv 
Fixes #8425
 2014-08-04 09:59:08 -05:00
Grzegorz Nosek
7f33580eba Fix exponential regex performance issue 
filter_leading_non_json_lines effectively does

re.match(".*\w+=\w+.*", line)

for every line of output. This has abysmal performance in case of large
Base64-encoded data (which ultimately does not match the regex but does
match the .*\w+= part) as returned e.g. by the template module (diffs).

Replacing the match with

re.search("\w=\w", line)

drops the complexity back to linear, and actually usable with large
diffs from the template module (a 150 KB Base64 diff kept Ansible
spinning at 100% cpu for minutes).

Also, check the easy cases (line.startswith) first while we're here.

Closes: #8932
 2014-08-01 14:46:00 +02:00
James Cammarata
189824dd76 Remove whitespace around args 
Fixes #8343
 2014-07-30 08:51:27 -05:00
James Cammarata
e6fa50a306 Move splitter to module_utils so modules can use it and fix command arg splitting 
Fixes #8338
 2014-07-29 14:55:16 -05:00
James Cammarata
a9f0f8e975 Revert "template.py: Handle purposely raised exceptions in lookup()" 
This reverts commit 2fda9bc743.
 2014-07-28 23:25:37 -05:00
James Cammarata
aee940aaca Reworking _clean_data() to be smarter about replaces 
Fixes #8228
 2014-07-28 16:50:18 -05:00
James Cammarata
7344baeffa Make sure empty non-quoted tokens are not added to the arg params list 2014-07-25 15:23:10 -05:00
James Cammarata
3714c0742f Split args on single spaces only 2014-07-25 13:13:15 -05:00
James Cammarata
63bcbd0af2 Fix for unicode decoding error in new splitting code 
Also adds a new unicode integration test
 2014-07-25 09:10:50 -05:00
Michael DeHaan
8d42f5cbfa Smush ds removal 2014-07-24 20:38:02 -05:00
James Cammarata
b8a4ba26f0 Refactoring split_args into sub-functions 2014-07-24 20:00:57 -05:00
Michael DeHaan
630f080cf0 Start of unit tests for split_args function, moved split_args to utils since not needed by modules (so far). 2014-07-24 20:15:04 -04:00
James Cammarata
43154e5101 Using custom splitting function for module param counting 2014-07-24 14:42:35 -05:00
James Cammarata
84759faa09 Security fixes: 
* Strip lookup calls out of inventory variables and clean unsafe data
  returned from lookup plugins (CVE-2014-4966)
* Make sure vars don't insert extra parameters into module args and prevent
  duplicate params from superseding previous params (CVE-2014-4967)
 2014-07-21 11:20:49 -05:00
James Cammarata
0e5b0a2e97 Revert "Set Jinja2's keep_trailing_newline=True in template_from_string." 
This reverts commit 7a8eb0b670.
 2014-07-17 09:07:04 -05:00
Jacob Leverich
7a8eb0b670 Set Jinja2's keep_trailing_newline=True in template_from_string. 
Without this setting, the newline idempotence of scalar strings changes depending on whether
or not they contain any Jinja2 template blocks.
 2014-07-14 13:36:17 -07:00
James Cammarata
4fc8d4b6fe Merge pull request #7649 from sivel/vault-password-script 
Allow --vault-password-file to work with a script as well as a flat file
 2014-07-14 10:57:16 -05:00
James Cammarata
db96344966 Re-fixing ability to have empty json files after inventory refactoring 2014-07-11 13:20:00 -05:00
James Cammarata
fe892fccb1 Merge remote-tracking branch 'svg/varsplugins_refactor' into svg_and_inventory_refactor 2014-07-07 14:16:37 -05:00
Henry Finucane
de64bbdc5f Support a whitelisted subset of jinja2 template options 2014-07-02 21:14:26 -07:00
James Cammarata
8ed6350e65 When parsing json from untrusted sources, remove templating tags 2014-07-01 14:14:14 -05:00
James Cammarata
eeb597360e Further safe_eval fixes 2014-07-01 14:14:14 -05:00
James Cammarata
35368e531b Additional fixes for safe_eval 2014-06-25 21:26:32 -05:00
James Cammarata
5429b85b9f Change safe_eval to a strict white list 2014-06-25 14:00:21 -05:00
Matt Martz
19f5ce2c9c Allow --vault-password-file to work with a script as well as a flat file 2014-06-24 15:02:24 -05:00
Paul Sokolovsky
f8bf9cdeec Handle TemplateNotFound to render more helpful error message. 
At the point the exception is handled, it is likely due to error loading
a sub-template included from main template. Besides file not found, it
can be caused also by include path failing Jinja2 checks. Now, when
rendering the exception from Jinja, it will include exception name. This
will give basic context or *what* the error is.

Fixes #7103
Fixes #7105
 2014-06-23 15:02:58 -05:00
Chris Church
243cd877ae Add integration tests for fetch/slurp, make powershell fetch/slurp work as close as possible to existing fetch/slurp modules. 2014-06-19 14:25:28 -05:00
Matt Martz
e7e95721b9 powershell modules will have a .ps1 extension 2014-06-19 14:24:13 -05:00
Chris Church
5dcaa30476 Add shell_plugins to abstract shell-specific functions out of runner, add winrm connection plugin, add initial Windows modules. 2014-06-19 14:24:12 -05:00
James Cammarata
cb13b30362 Use file documentation fragement for the copy module 2014-06-16 15:36:15 -05:00
James Cammarata
0fa5100a2c Merge branch 'fix-7596' of https://github.com/kilburn/ansible into kilburn-fix-7596 2014-06-03 10:26:25 -05:00
Jack Neely
2fda9bc743 template.py: Handle purposely raised exceptions in lookup() 
If a lookup plugin is run by the lookup() template method it should pass
along any AnsibleError (or child exception classes) rather than just eat
them.  These exceptions are purposely raised by the plugin.
 2014-05-30 16:41:20 -04:00
Marc Pujol
d0f82e94e8 Ensure there are no duplicates in the merged/intersected lists 2014-05-30 15:47:18 +02:00
Marc Pujol
f892cc798c Merge and intersect lists without using sets. 
Using sets for these operations is dangerous because sets cannot contain
certain object types (such as lists) and their iteration order is
undefined.

Fixes #7596
 2014-05-30 09:07:57 +02:00
James Cammarata
92f16b3d6f Merge pull request #7539 from jimi-c/issue_7503_freebsd_su_fixes 
Fixes for su on freebsd
 2014-05-25 15:09:58 -05:00
Abhijit Menon-Sen
f6792b724a Don't double (or triple) up common error messages 
process_common_errors() was called thrice, each time appending to the
existing error message, and leading to confusing repetition in the
message that was finally displayed.

Fixes #7498
 2014-05-23 21:05:42 +05:30
James Cammarata
1e672a0fec Fixes for su on freebsd 
Addresses multiple issues when using su on freebsd including
* su prompt differs between platforms, so turned that check into a
  regex comparison instead of a simple string comparison
* not using '-c' after su causes problems, so added that for all
  platforms
* fixed quoting issues due to multiple uses of '-c' introduced by
  the above fix

Fixes #7503
Fixes #7507
 2014-05-23 10:06:09 -05: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
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
85bd6810bb Pass vars_files on to included playbooks too 
Fixes #7384
 2014-05-14 08:37:47 -05:00
Brian Coca
8a84b22d76 bumped to 1.7 2014-05-06 23:43:07 -04:00
Christian Berendt
6676720ce5 fixed typos found by RETF rules in PY files 
rules are avaialble at https://en.wikipedia.org/wiki/Wikipedia:AutoWikiBrowser/Typos
 2014-05-03 18:40:05 +02:00
James Cammarata
8e45fa9b63 Moving display-related functions to new module in utils 2014-04-30 15:33:46 -05:00
James Cammarata
6069ff6e9e Adding a new system_warnings config option to supress warnings 2014-04-30 14:44:10 -05:00
James Cammarata
4cadcccc48 Catch pycrypto warning about gmp and show a nice warning on stderr 2014-04-29 14:28:14 -05:00
James Cammarata
1576e8d611 Adding missing options to the file documentation fragment 2014-04-28 15:31:24 -05:00
Brian Coca
c5d5481ebb added doc noting the change in behaviour 2014-04-27 09:37:44 -04:00
James Cammarata
b9d8b3b911 Merge pull request #7132 from jimi-c/issue_6601_hide_vault_yaml 
Hide YAML content on syntax errors when a vault password is specified
 2014-04-24 00:28:12 -05:00
James Cammarata
460794d697 Merge pull request #7140 from jimi-c/issue_6962_traceback_callbacks_unicode 
Fix handling of non-JSON lines in responses
 2014-04-23 19:53:42 -05:00
James Cammarata
5e598c5337 Fix handling of non-JSON lines in responses 
Garbage lines with ' = ' in them were causing parsing errors,
where key=val lines should not have spaces around the equals.

Fixes #6962
 2014-04-23 15:17:31 -05:00
James Cammarata
93b5769d94 Hide YAML content on syntax errors when a vault password is specified 
Fixes #6601
 2014-04-23 09:23:07 -05:00
James Cammarata
75e0b7a5cf Make sure umask is set restrictively before creating any vault files 2014-04-18 13:38:59 -05: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
willthames
509561f658 Moved AWS modules over to common module fragments 
Created common module doc fragment, and applied to all
modules that use ec2_connect or connect_to_aws as
they definitely share the common doc fragments
 2014-04-09 21:19:12 +10:00
James Tanner
2d33cd1b5d Fixes #6894 add missing file and remove debug line 2014-04-08 13:22:23 -04:00
James Tanner
68cd7258b6 Fixes #6894 create docs fragment for files 2014-04-08 13:20:15 -04:00
Serge van Ginderachter
d240e2b9fb Introduce an ansible_version dict as runner variable 
Given the version:
    "1.6 (ansible_version_var 14499e8bf3) last updated 2014/03/21 17:07:50 (GMT +200)"

  We get the special variable:
    "ansible_version": {
        "full": "1.6",
        "major": 1,
        "minor": 6,
        "revision": 0,
        "string": "1.6 (ansible_version_var 14499e8bf3) last updated 2014/03/21 17:07:50 (GMT +200)"
       }

	modified:   lib/ansible/playbook/__init__.py
	modified:   lib/ansible/runner/__init__.py
	modified:   lib/ansible/utils/__init__.py
 2014-04-08 17:14:42 +02:00
James Tanner
5a65dc3b6a Fixes #6820 fix erroneous missing vault password error when using the template module 2014-04-04 13:06:35 -04:00
Michael DeHaan
1fa19e29e8 Use common file argument system previously implemented by @sivel for rax modules on the file modules as well (copy/file/template). 
Application to other cloud providers would make very good sense.
 2014-04-03 16:52:39 -04:00
Matt Martz
7b5f89ec7c Use PluginLoader for module docs fragments 2014-04-03 16:52:39 -04:00
Matt Martz
bb6f7a267a Add support for shared module documentation fragments 2014-04-03 16:52:39 -04:00
James Cammarata
ee0a0b492b Allow isprintable() util function to work with unicode 
Fixes #6842
 2014-04-03 15:29:51 -05:00
James Cammarata
6f34a6336f Differentiate decryption failures from empty data files in ansible-vault 
Fixes #6822
 2014-04-02 15:52:08 -05:00
James Cammarata
a4df906fc9 Fixes to safe_eval 2014-04-01 16:23:22 -05:00
Cristian Ciupitu
1eaf85b89f Micro-optimization: replace s.find(x)!=-1 with x in s 
timeit shows a speedup of ~3x on Python 2.7.5 x86_64.
It also makes the code a bit shorter.
 2014-03-27 20:35:20 +02:00
James Tanner
2a976ac313 Fixes #5059 Ignore lookup failures when templating a task name 2014-03-26 11:28:43 -04:00
Serge van Ginderachter
b0ff1ea425 performance optimisation in hash merge logic 
rewrite deepcopy in util.merge_hash and just iterate
on an inventory with 500 groups and 800 hosts this brings back the
inventory initialisation from 13s to 3s (with hash_behaviour=merge)
 2014-03-26 11:37:31 +01:00
Serge van Ginderachter
d4634983f0 Move group/host_vars parsing into core inventory 
modified:   lib/ansible/inventory/__init__.py
	deleted:    lib/ansible/inventory/vars_plugins/group_vars.py
	modified:   lib/ansible/utils/__init__.py
 2014-03-26 11:37:26 +01:00
jctanner
7b8d1c0ffd Merge pull request #6580 from ramondelafuente/fix-vault-editor-call 
Changed call to EDITOR to allow for parameters
 2014-03-25 15:48:59 -04:00
Ramon de la Fuente
c79c001bfb Changed call to EDITOR to allow for parameters 
The EDITOR environment variable is used to create and edit files in the vault.
But if the EDITOR variable contains parameters, subprocess.call() breaks.

This fixes the EDITOR environment variable to be safely split into a list.
It adds a dependency on shlex.
 2014-03-25 20:29:03 +01:00
James Cammarata
8c7828d469 Tweaking error message resulting from undefined template variables 
Fixes #5114
 2014-03-25 11:56:55 -05:00
Michael DeHaan
c42dbf80a2 Merge pull request #6586 from sivel/probline-logic-fix 
Fix logic in process_common_errors for unbalanced quotes
 2014-03-19 17:45:49 -04:00
James Tanner
b8f627d1d5 Prevent rewriting the encrypted file if decryption fails 2014-03-19 16:31:03 -04:00
James Tanner
e71857fbdf Addresses #6579 Only strip vault passwords if given 2014-03-19 16:08:35 -04:00
James Tanner
8c2e1e2baa Addresses #6579 Disallow vault passwords with newline characters by stripping them in utils 2014-03-19 15:56:14 -04:00
James Cammarata
a9000e7f3a Making the error messages for bad key/dir permissions more understandable 
Fixes #6254
 2014-03-19 14:09:03 -05:00
Matt Martz
2aaecc5afa Fix logic in process_common_errors for unbalanced quotes 2014-03-19 13:49:31 -05:00
Michael DeHaan
94e3350b38 Catch a unquoted line error. Fixes #6532 2014-03-17 17:15:42 -04:00
James Tanner
ad70e9bcd6 Fixes #6227 skip non-unicode strings and catch decode errors silently in template_from_string 2014-03-17 16:54:25 -04:00
James Tanner
b14c658532 Fix concatenation for with_file 2014-03-17 10:38:22 -04:00
Michael DeHaan
fd0ff6f174 Merge pull request #5711 from sivel/plugin-realpath 
Use realpath for plugin directories instead of abspath
 2014-03-16 15:42:47 -05:00
Cristian Ciupitu
0749112286 Micro-optimization: replace s.find(x)!=-1 with x in s 
timeit shows a speedup of ~3x on Python 2.7.5 x86_64.
It also makes the code a bit shorter.
 2014-03-16 13:10:28 -04:00
Michael DeHaan
d1753046e0 Revert "Correctly catch template errors without returning invalid data" 
This reverts commit 3cd7d47b7e.
 2014-03-13 07:46:19 -04:00
James Tanner
0e38f5dfdc Check for hash availability during vault operations 2014-03-12 09:38:29 -04:00
James Tanner
6740a1f342 Wrap crypto.hash imports with try/except 2014-03-10 19:44:08 -04:00
Michael DeHaan
2fa6110961 Update the message about pycrypto to include that python-devel must be installed. 2014-03-10 17:23:37 -04:00
James Tanner
0d6f6ad282 Implement new default cipher class AES256 2014-03-10 16:15:44 -05:00
Matt Martz
4b400ca5e9 Only used stripped data for testing if the file is json, but used unstripped when actually parsing. Fixes #6348 2014-03-10 13:43:34 -05:00
James Cammarata
3cd7d47b7e Correctly catch template errors without returning invalid data 
Fixes #6329
 2014-03-07 14:36:54 -06:00
Michael DeHaan
e486dbab04 Use the loaded variable since we have it assigned, not just for error detection. 2014-03-06 22:15:21 -05:00
Michael DeHaan
3f07ec3d73 Fixup JSON error reporting in previous commits. 2014-03-06 22:07:35 -05:00
Michael DeHaan
79799f6819 Allow any file that can be in YAML to also be in JSON. This is primarily done to support non-visual editors better. 2014-03-06 21:42:51 -05:00
Michael DeHaan
94a7fb60fe Allow escaped comments in inventory files. 2014-03-05 20:10:25 -05:00
Richard C Isaacson
b41d8106ff Revert "Merge pull request #6287 from risaacson/fix_hash_in_var" 
This reverts commit a808287451, reversing
changes made to 6129ea7566.
 2014-03-05 14:49:30 -06:00
Richard C Isaacson
38abd5e20e Break this out into a reusable function and document regex shortcomings. 2014-03-05 10:50:58 -06:00
Michael DeHaan
46ec8759d5 Remove the legacy templating code, which was guarded by deprecation warnings in the previous two releases, and undocumented for a long time. use {{ foo }} to access variables instead of ${foo} or $foo. 2014-02-28 18:38:45 -05:00
Richard C Isaacson
9c8bbe2904 column must always be less than len(probline) 
Fixes related to GH-5773.
 2014-02-26 16:28:34 -06:00
Richard C Isaacson
585766201d When looking for double colon len(line) is longer then 1. 
Addresses GH-5116.

It comes up that when parsing json that if you are missing the last double quote on the last variable and the next line is just '}' we will get an out of range error. In this instance we will also then make sure that the line is long enough to have two colons.
 2014-02-26 14:25:56 -06:00
James Tanner
baed7a0ed9 Fixes #6187 Add unit tests for VaultLib 2014-02-26 12:10:09 -05:00
James Tanner
35def422a3 Addresses #6188 Add --vault-password-file to bin/ansible and bin/ansible-playbook 2014-02-26 11:01:03 -05:00
James Tanner
9c9f15acb7 Fix decryption error 2014-02-24 13:20:27 -05:00
James Tanner
52a8efefba Vault rewrite, pass 1 2014-02-24 13:09:36 -05:00
Michael DeHaan
9686695170 Assume empty files are unencrypted. 2014-02-21 21:06:04 -05:00
James Tanner
bee089d5e1 Remove entropy comment 2014-02-19 13:36:20 -05:00
James Tanner
86b9f84fb9 Change entropy message for vault 2014-02-19 13:31:01 -05:00
James Tanner
3a965a1392 Remove intermediate string on decrypt 2014-02-19 11:35:00 -05:00
James Tanner
286ca505bd Remove breakpoint 2014-02-19 11:08:02 -05:00
James Tanner
84467a8f12 Change retype to confirm 2014-02-19 11:06:53 -05:00
James Tanner
aa46ab1d86 Fix function name 2014-02-19 11:05:08 -05:00
James Tanner
3fc87e011b Fix all other calls to yaml 2014-02-19 11:01:21 -05:00
James Tanner
427b8dc78d Ansible vault: a framework for encrypting any playbook or var file. 2014-02-18 15:35:12 -05:00
James Cammarata
b8646991db Filter out messages that match the pattern username:password@host 
This filtering is done in both the module invocation logging and in
the regular verbose() logging output.

Fixes #4087
 2014-02-13 14:23:49 -06:00
James Cammarata
bbda98a3ee Merge branch 'issue_4812' into devel 2014-02-10 13:35:53 -06:00
James Cammarata
bb79b16d59 Specify mode in the makedirs call for fireball/accelerate keys 2014-02-10 13:27:43 -06:00
xyrix
20d97416e5 fixed thinkoes 2014-02-06 13:02:11 +00:00
xyrix
0af40374ed fixed file perms checking 2014-02-06 12:48:34 +00:00
xyrix
1de45bf687 made accelerate keys directory configurable, and permissions for the file and dir configurable, and gave them a safe default 2014-02-06 08:53:43 +00:00
James Cammarata
a72dc2ec34 Use finalize method in jinja2 to convert None values to empty strings 
Fixes #4812
 2014-02-06 00:43:31 -06:00
James Cammarata
959a156195 Properly count newlines appearing at the end of templates after rendering 
Fixes #4633
 2014-02-05 15:14:19 -06:00
jctanner
6c25ea1b91 Merge pull request #5527 from sergevanginderachter/basedirdwim 
path_dwim: fix when basedir not set
 2014-01-30 10:54:19 -08:00
James Cammarata
3fddd78ec5 Fixing traceback caused by incorrect argument passing to json.dumps 
Fixes #5756
 2014-01-27 11:28:07 -06:00
Matt Martz
5ba6739603 Use realpath for plugin directories instead of abspath 2014-01-21 12:41:58 -06:00
Paul Durivage
f72f5a20df Revert "Revert "Merge pull request #5325 from angstwad/add-su-support"" 
This reverts commit c17d0e0357.

Conflicts:
	lib/ansible/runner/connection_plugins/paramiko_ssh.py
 2014-01-20 19:19:03 -06:00
James Tanner
c17d0e0357 Revert "Merge pull request #5325 from angstwad/add-su-support" 
This reverts commit 6f4bfa2cff, reversing
changes made to c91ba3a7c7.
 2014-01-20 16:10:11 -05:00
Paul Durivage
4088243deb Proposing fix for Issue #4324; adding support for su in connection plugins ssh, ssh_alt 
Fixes for ssh_alt support, adding in references to in_data where appropriate
 2014-01-20 11:25:10 -06:00
James Tanner
d7c8cf6ca7 Fixes #4958 Truncate printed stdout if it contains non-printable characters 2014-01-10 15:08:45 -05:00
James Tanner
78ec7c736f Fixes #3973 Second Revision of live ansible-pull output 2014-01-10 11:18:02 -05:00
Serge van Ginderachter
836fb4143c path_dwim: fix when basedir not set 2014-01-08 02:21:10 +01:00
James Tanner
d6b78e9dd6 Fixes #5238 Improve error messaging about unquoted variable references in playbooks 2014-01-06 16:47:19 -05:00
Michael DeHaan
c41a23a35a Complete removal/refactoring of conditional deprecations. 2014-01-03 19:23:19 -05:00
Michael DeHaan
8e5b7d3095 Remove code underlying when_* and only_if, which are deprecated features slated for removal in the 1.5 release. 2014-01-03 19:13:21 -05:00
Michael DeHaan
28b9fd4e30 We have had only_if, when_foo, etc, deprecated for a while and said they would be removed in 1.5. Now they are, with friendly error messages still. 
Users of these features should use "when:" as documented at docs.ansible.com.

Similarly, include + with_items has been removed.  The solution is to loop
inside the task files, see with_nested / with_together, etc.
 2014-01-03 13:47:54 -05:00
James Tanner
21fdb2bbc7 Fixes #5200 Handle template contents with unicode strings better 2014-01-03 11:18:20 -05:00
Michael DeHaan
de2ffc1276 Don't need to document these guys. 2014-01-02 17:55:59 -05:00
Janez Nemanic
8752ae6909 Fix for issue #4730 - stacktrace when deferenencing a non-existent group 2013-12-02 18:25:43 +01:00
James Cammarata
9101c2af98 Fix traceback in template error detection code 
Fixes #5081
 2013-11-29 08:47:54 -06:00
James Cammarata
1f80aa768a Fix bug in error detection code, where a zero-length string was causing a traceback 
Fixes #5064
 2013-11-27 11:57:15 -06:00
Antonio Zanardo
8dbd91b5ad fix typo in deprecation warning 2013-11-23 19:15:51 -02:00
Michael DeHaan
fc909b453f Make the legacy template detection system not hit a false positive when 
replacing a \$ with $.
 2013-11-18 17:51:57 -05:00
jctanner
8e8c8efc8f Merge pull request #4769 from alanfairless/more-password-entropy-revised 
Revised patch for more password entropy
 2013-11-07 13:39:05 -08:00
jctanner
8d9b53b445 Merge pull request #4733 from sivel/4323-sudo-pass 
Add ansible_sudo_pass hostvar support. Fixes #4323
 2013-11-05 15:01:19 -08:00
Michael DeHaan
eab6737209 Clarify a warning message. 2013-11-03 12:47:07 -05:00
Alan Fairless
0824f004d9 Revised patch for more password entropy 2013-11-01 09:51:35 -05:00
Michael DeHaan
bbf212a268 Simplify the way the debug: var=varname plugin works. 2013-10-31 19:35:50 -04:00
Michael DeHaan
8b2cd6413b When inside an apt or yum task account for multiple conditionals. Fixes 4745. 2013-10-31 17:19:58 -04:00
Michael DeHaan
90cce35919 This allows variable references in playbooks in a different way. 2013-10-30 21:26:16 -04:00
Matt Martz
ea2ec6237a Add ansible_sudo_pass hostvar support 2013-10-30 13:18:35 -05:00
James Tanner
d154bf8781 Revert templating enhancements from 73dbab70 e6c28658 d409352c 9858b1f2 4587528b 9b1fe455 214b0b05 8d3db803 7f9504d1 5031104c 35cb9dc2 2bd8cb57 1e85c754 2013-10-30 10:50:16 -04:00
Michael DeHaan
73dbab702f Don't run lookup plugins while trying to simplify the input datastructure. 2013-10-28 09:08:53 -04:00
Michael DeHaan
4587528b99 Fix typo in comment. 2013-10-26 19:32:07 -04:00
Michael DeHaan
d409352c85 Remove some interior imports in the code. Not really needed but nice to have them gone. 2013-10-26 19:26:43 -04:00
Michael DeHaan
e6c28658b4 Add in some code to pre-template datastructures prior to template usage. This prevents a certain class of error 
where filter evaluations can happen too early due to the template engine recursion being a bit limited.

Addresses #4662
 2013-10-26 19:11:13 -04:00
Michael DeHaan
9858b1f2f3 Enable imports to work on a snippet based system, allowing for instance a library of common EC2 functions 
to be reused between modules.  See library/system/service and library/system/ping for initial examples.  Can
work the old way to just import 'basic', or can import the new way to import multiple pieces of code from
module_utils/.
 2013-10-26 11:09:30 -04:00
James Tanner
9b1fe455c6 Fixes #4549 Do not call lookup plugins when templating a task's name 2013-10-25 10:27:38 -04:00
James Tanner
214b0b052c Fixes #4608 add lookup to template globals to make plugins work again 2013-10-22 12:00:54 -04:00
Michael DeHaan
2bd8cb5790 Make the deprecation detector in templates more accurate. Fixes #4514. 2013-10-19 14:14:16 -04:00
Michael DeHaan
64bbeb9d24 Suggest fixing unbalanced quotes in a bit less cases. Fixes #4501 2013-10-19 13:57:28 -04:00
Michael DeHaan
7f9504d14d Fix a typo. 2013-10-19 13:52:48 -04:00
Michael DeHaan
8d3db80370 Some misc cleanup and removal of unused imports. 2013-10-19 13:50:14 -04:00
Michael DeHaan
5031104c3a Finishing touches on template cleanup. 2013-10-19 11:40:48 -04:00
Michael DeHaan
1e85c7544b Further WIP on template cleanup. 2013-10-19 11:39:52 -04:00
Michael DeHaan
35cb9dc22f Work in progress about cleaning up template code. 2013-10-19 11:39:52 -04:00
jctanner
6480945184 Merge pull request #4541 from Kami/improve_template_render_error_messages 
Make errors which get thrown during template rendering more user-friendly
 2013-10-16 17:52:07 -07:00
Stoned Elipot
4430d0f5a6 when searching for a plugin only look for a regular file 2013-10-16 21:23:37 +02:00
Tomaz Muraus
922f61899e Throw a more user-friendly exception during template rendering process. 2013-10-16 16:48:17 +02:00
Brian Coca
bd9acedb57 fixed name colision between warnings dict and module 
Signed-off-by: Brian Coca <briancoca+ansible@gmail.com>
 2013-10-15 14:58:15 -04:00
Michael DeHaan
e131de4de0 Added "debug: var=variableName" capability. 2013-10-14 21:01:38 -04:00
Michael DeHaan
c90a82fd52 Handle possible scenario where conditional might be an integer (whoa!) down the error path. Super rare but fixes #4483. 2013-10-13 09:19:41 -04:00
Michael DeHaan
9ea54fcaaf Fixes a dev branch glitch where a conditional could be applied to multiple tasks. Also improves the errors on parsing bad conditionals to make them less confusing to users. 2013-10-12 17:39:28 -04:00
Michael DeHaan
add45d2ca9 Fixup legacy var detector. 2013-10-11 19:16:36 -04:00
Michael DeHaan
a45494a896 Add warnings feature. 2013-10-11 19:04:26 -04:00
Michael DeHaan
9637f620d7 Deprecation warnings of several flavors, nice and purple and can be disabled 
in ansible.cfg.
 2013-10-11 18:37:39 -04:00
Michael DeHaan
a017a69bb3 Have the parser explain another type of YAML gotcha to reduce the need for users to ask how to resolve it. 2013-10-11 17:34:26 -04:00
Michael DeHaan
861f076df5 Tweak the syntax-detector-warning-suggester-message (SDWSM) a little. 2013-10-11 17:34:26 -04:00
Michael DeHaan
c69e19c6a6 Enhance references to logging functionality. Fixes #3431. 2013-10-08 08:26:40 -04:00
Michael DeHaan
44e391fd8b Merge pull request #4255 from mcodd/legacy_vars_fix 
Fix for legacy_playbook_variables (should fix issue #4254)
 2013-10-07 05:44:06 -07:00
Michael DeHaan
ea73151757 Add automatic advice when folks hit one of two common but minor YAML gotchas, so they can be more easily correct them on their own. 2013-10-06 10:23:44 -04:00
Ustun Ozgur
977b31249a Update cache check in find_plugin 
I am not familiar with the internals, but this line looked suspicious.
 2013-09-29 14:03:10 +03:00
Matt Coddington
7f7116de3b commit 9db4f7a made a change that also needed to include this to retain correct legacy_playbook_variables behavior 2013-09-25 23:22:09 -04:00
Andrey Shorin
fd101dd2d6 Encode to utf-8 only when needed 2013-09-25 09:29:57 +04:00
Andrey Shorin
21f5bc4242 Prevent UnicodeEncodeError: 'ascii' codec can't encode characters in position ...: ordinal not in range(128) 2013-09-25 09:29:56 +04:00
Alek Storm
3569a2ffee Handle AnsibleUndefinedVariable's raised from lookup plugins like jinja2 UndefinedError's 2013-09-20 19:56:12 -05:00
James Cammarata
d5b96abd80 Added support for -vvvv to enable ssh connection debugging 
This patch also checks specifically for a return code of 255, which
indicates an unknown SSH error of some kind. When that happens, ansible
will now recommend running with -vvvv (if not enabled) or show the
output from 'ssh -vvv' (when it is enabled)
 2013-09-19 05:58:54 -05:00
James Cammarata
5b15010099 Merge branch 'issue_3312_role_links' into devel 2013-09-16 09:29:25 -05:00
James Cammarata
35d138a0d6 When checking conditionals, don't dereference when the variable contains dashes 
Fixes #4104
 2013-09-13 13:52:58 -05:00
James Cammarata
d0236f6ada Check for link in path in utils.path_dwim_relative() 
This allows an included path to be relative to a directory, if the
basedir of the original path is a symlink. In that case, the path
is normalized and the file is searched for in the normalized path.

Fixes #3312
 2013-09-12 20:44:10 -05:00
James Cammarata
294451d002 Correctly handle variable issues when evaluating jinja2 when statements 
Fixes #4025
 2013-09-09 14:50:21 -05:00
James Cammarata
4e9dee6093 Use StringIO to feed md5 calculation to prevent unicode issues 
Fixes #4014
 2013-09-06 09:11:47 -05:00
James Cammarata
a202adcae1 Merge branch 'doublecallback' of https://github.com/sergevanginderachter/ansible into sergevanginderachter-doublecallback 2013-09-04 09:58:06 -05:00
James Cammarata
7c1c9b3d10 Fix message in utils related to python-keyczar and fireball/acc mode 2013-09-03 11:16:50 -05:00
James Cammarata
521e14a3ad Fireball2 mode working! 2013-08-28 11:14:58 -05:00
James Cammarata
acc5d09351 Initial commit for the "fireball2" connection plugin 
Still needs:
* chunked file transfer/receive
* should probably move all send/recv operations to separate
  functions to reduce code duplication
* initial connection setup over ssh? or do we handle that in runner?
 2013-08-28 11:14:58 -05:00
James Cammarata
fd2aabaa27 Initial work for the AES cipher class 
This is based somewhat loosely on how Keyczar does things. Their
implementation does things in a much more generic way to allow for more
variance in how the cipher is created, but since we're only using one
key type most of our values are hard-coded. They also add a header to
their messages, which I am not doing (don't see the need for it
currently).
 2013-08-28 11:14:58 -05:00
James Cammarata
88966e6558 Use AnsibleError instead of exit for errors in utils 2013-08-25 11:46:45 -05:00
James Cammarata
e11bb0cad4 Merge branch 'plugins-work' of https://github.com/ferringb/ansible into ferringb-plugins-work 2013-08-22 14:23:25 -05:00
James Cammarata
157b697a83 Merge branch 'always_run-6' of https://github.com/stoned/ansible into stoned-always_run-6 2013-08-22 12:10:28 -05:00
James Cammarata
6bf5d19506 SSH connection plugin creates ControlPersist socket files in a secure directory 
Files were being created in /tmp, but will now be created in $HOME/.ansible/cp/
Addresses CVE-2013-4259: ansible uses a socket with predictable filename in /tmp
 2013-08-21 11:40:46 -05:00
Stoned Elipot
f0743fc32a Introduce the 'always_run' task clause. 
The 'always_run' task clause allows one to execute a task even in
check mode.

While here implement Runner.noop_on_check() to check if a runner
really should execute its task, with respect to check mode option
and 'always_run' clause.

Also add the optional 'jinja2' argument to check_conditional() :
it allows to give this function a jinja2 expression without exposing
the 'jinja2_compare' implementation mechanism.
 2013-08-20 23:09:44 +02:00
Petr Svoboda
fff4f1da33 Improve behavior with error_on_undefined_vars enabled 
Pass fail_on_undefined flag to recursive calls to `template` function,
so more undefined variables are detected.

Works only for Jinja style variables. Undefined legacy variables are
never detected.
 2013-08-20 00:40:49 -05:00
Brian Harring
902183ac0e Enforce alphanumeric ordering for plugins grabbed via glob. 
If this isn't done, it's left to directory ordering which can result
in indeterminent behaviour.
 2013-08-19 19:48:17 -04:00
Serge van Ginderachter
173586b871 Ensure plugin_loader.all() only loads one instance 
by ensuring all basedirs, plugin paths and extra
paths are handled as absolute paths and are checked
to not add any doubles.

This fixes the corner case where e.g. the user has
an additional plugin path configured to a dir
relative to his playbooks or inventory location,
which also matches the  _plugin subdir relative to
one of the basedirs in the play.

For most plugins this doesn't show as an obvious issue
except for callback_plugins, which might fire more
than once. Other plugins (inventory and template
plugins) might unnecessarily be ran twice.

e.g. ansible.cfg has
callback_plugins   = ./plays/callback_plugins
and plays/ contains a playbook file:
.
├── ansible.cfg
├── inventory
└── plays
    ├── callback_plugins
    │   └── timestamp.py
    └── site.yml

modified:   lib/ansible/utils/plugins.py
 2013-08-12 22:17:53 +02:00
Abhijit Menon-Sen
1a90d01ba9 Fix some typos discovered during casual reading 2013-08-11 18:41:23 +05:30
Brian Coca
581a0c9f59 now correctly 'types' value pairs that are passed as options to jinja 
override
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
 2013-08-01 21:08:23 -04:00
Michael DeHaan
bdef7f1774 Merge pull request #3711 from ashorin/devel 
Allow --diff on UTF-8 encoded files and templates
 2013-08-01 17:16:32 -07:00
Michael DeHaan
daf5ecc7c9 Merge pull request #3684 from stoned/fix-3668 
Add extra module path early during playbook parsing.
 2013-08-01 17:14:35 -07:00
Andrey Shorin
664215eb02 Allow --diff on UTF-8 encoded files and templates 2013-07-31 15:58:32 +04:00
Stoned Elipot
841093921b Add extra module path early during playbook parsing. 
This should fix issue #3668

Also prevent an extra module path to be added multiple times.
 2013-07-28 18:47:26 +02:00
Stoned Elipot
a1503c4d59 stringify conditional before handing it to Jinja2 for evaluation. 
This should fix simple conditionals like:

    when: ansible_selinux

While here add tests for ansible.utils.check_conditional() in
"jinja2_compare mode".
 2013-07-23 22:24:53 +02:00
Michael DeHaan
0756aa406a Change conditional operation workflow. 
Conflicts:

	lib/ansible/utils/__init__.py
 2013-07-21 10:37:02 -04:00
Michael DeHaan
7f462a346a Work in progress on merging changed_when. 2013-07-21 10:34:47 -04:00
Michael DeHaan
62b39d3de5 Fix for saving conditionals in variable expressions. 2013-07-21 08:52:00 -04:00
Stoned Elipot
2d88c70cd5 Introduce exception AnsibleFilterError and use it in Jinja filters. Ignore this exception when trying to find the name of a task for display (callback) purpose. 2013-07-07 19:18:32 +02:00
Ton Kersten
37ee361be1 Repair issue #3447 2013-07-05 19:10:36 +02:00
Michael DeHaan
9db4f7a9a6 Makes host key checking the default behavior but can be disabled in ansible.cfg or by environment variable. 2013-07-03 16:47:20 -04:00
Michael DeHaan
c2988dfdb0 Merge branch 'option-updates' of git://github.com/jlund/ansible into devel 
Conflicts:
	bin/ansible-pull
 2013-06-30 19:31:37 -04:00
Michael DeHaan
98e7eaf07a Merge pull request #3316 from dsedivec/devel 
expanduser on each component of plug-in paths
 2013-06-30 09:12:15 -07:00
Stoned Elipot
b7f89837bb Remove redundant call to _get_path() in PluginLoader.find_plugin() 2013-06-30 16:38:26 +02:00
Joshua Lund
dc984d94ac Updates to Ansible command options 
* Moved the --list-hosts option that is common to both `ansible` and
  `ansible-playbook` into utils/__init__.py (corrects a FIXME)
* Wrote new help text for the --list-hosts option that makes sense
  for both of the commands that it applies to
* Changed the usage argument in `ansible-playbook` so that it is
  setup in the base_parser method the same way that it is in
  the `ansible` executable
* Updated the help text for several options to correct typos,
  clarify meaning, improve readability, or fix grammatical errors.
  In the case of `ansible-pull`, I changed the help text so that
  it adheres to the same standards as the other executables.
 2013-06-26 19:57:31 -06:00
Dale Sedivec
b32131c867 expanduser on each component of plug-in paths 
ansible.constants was calling expanduser (by way of shell_expand_path)
on the entire configured value for the library and *_plugins
configuration values, but these values have always been interpreted as
multiple directories separated by os.pathsep.  Thus, if you supplied
multiple directories for one of these values, typically only the first
(at least on *nix) would have e.g. "~" expanded to HOME.

Now PluginLoader does expansion on each individual path in each of
these variables.
 2013-06-22 17:01:12 -05:00
George Miroshnykov
c642ba77ae Added basic support for hash_behaviour=merge in roles 
Dict vars passed to roles are now properly merged
instead of simply overriding dict vars that are
coming from vars_files.
 2013-06-19 09:14:20 +03:00
Michael DeHaan
132c89e681 Merge branch 'callbackinit' of git://github.com/sergevanginderachter/ansible into devel 2013-06-18 20:52:43 -04:00
Michael DeHaan
5a504e3a3b Tweak error messages for undefined variables feature. 2013-06-18 13:30:02 -04:00
Michael DeHaan
637983cf31 cleanup example config file + Squashed commit of the following: 
commit c36b66dc952dfff91043ecbca56cf3f1f8f00703
Merge: 240d7bf f4cf934
Author: Michael DeHaan <michael@ansibleworks.com>
Date:   Tue Jun 18 13:04:51 2013 -0400

    Merge branch 'unevaluated-vars' of git://github.com/lorin/ansible into lorin_undefined

    Conflicts:
    	lib/ansible/runner/__init__.py

commit f4cf93436767f73b62a16067ab5e628830045896
Merge: 2531440 07a1365
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Thu Jun 6 11:07:41 2013 -0400

    Merge branch 'devel' into unevaluated-vars

commit 253144045cbafd7d72836f1017c62ac4ba623186
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Thu Jun 6 11:06:37 2013 -0400

    Fail template from file on undefined vars

    If config option is set, raise an exception if templating from a
    file and a variable is undefined.

commit aecb71d8b75257f0f3e11a9b176fc3737aecef8d
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Wed Jun 5 17:12:12 2013 -0400

    Add fail_on_undefined flag

    Add a fail_on_undefined flag to the template and template_from_string methods.

    If this flag is true, then re-raise the ninja2.excpetions.UndefinedError instead of
    swallowing it.

commit cbb1808f0585f01536240aee05a1bfd06c4b4647
Merge: d4bbf49 41425fb
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Wed Jun 5 16:14:12 2013 -0400

    Merge branch 'devel' into unevaluated-vars

commit d4bbf492b0b63c789d66ab60d0ec634d100fca82
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Mon Jun 3 19:46:13 2013 -0400

    template: Raise UndefinedError exception

    In template_from_string, raise an undefined error if it occurs.

    Have the caller catch it and throw an AnsibleUndefinedVariable

commit c94780280515f1f3756fdc429b2b1e87b365e9b7
Merge: 8d919d6 be33bcf
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Mon Jun 3 10:09:43 2013 -0400

    Merge branch 'devel' into unevaluated-vars

commit 8d919d6c97b28a42f47ca7248c542695baf6175f
Merge: 0f68ad8 b8630d2
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Thu May 30 16:27:48 2013 -0400

    Merge branch 'devel' into unevaluated-vars

commit 0f68ad8193ac17488e339a258f8c63fdae399c26
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Thu May 30 14:32:03 2013 -0400

    Optionally fail task on undefined variables

    This patch introduces a new configuration option called
    error_on_undefined_vars, which defaults to false.

    If this option is set to true, then a task which has unevaluated
    variables in its arguments will fail instead of running. Output looks
    like this:

        TASK: [set rabbitmq password] *************************************************
        fatal: [10.20.0.7] => Undefined variables: rabbitmq_user, rabbitmq_password
 2013-06-18 13:24:30 -04:00
trbs
a4223e119d fixed x-bits in git 2013-06-16 22:22:16 -04:00
Serge van Ginderachter
2a7f9df109 add support for callback_plugins/ relative to playbook 2013-06-12 23:54:00 +02:00
Michael DeHaan
3d21dab705 Small fix so template plugins can see inject variables. 2013-06-10 14:23:48 -04:00
Michael DeHaan
3783dc42d4 normalize path 2013-06-03 09:57:02 -04:00
Michael DeHaan
b8a66ce5bb Lookup plugins in included files now look in paths relative to their files, allowing role usage. 2013-06-01 18:15:38 -04:00
Michael DeHaan
44e32cc45e Some formatting fixes so docs will build, etc. 2013-05-29 18:43:23 -04:00
Michael DeHaan
159ba7d68a Merge pull request #2956 from akerl/unicodefix 
ignore unicode errors in stdout
 2013-05-24 19:46:25 -07:00
Dale Sedivec
611d56dc4c Plug-ins loaded from top-level plug-in directory 
PluginLoader._get_paths, as of 391fb98e, was only finding plug-ins that
were in a subdirectory of one of the basedirs (i.e. in a category
directory).  For example, action_plugins/foo.py would never be loaded,
but action_plugins/bar/foo.py would work.

This makes it so that "uncategorized" plug-ins in the top level of a
directory such as action_plugins will be loaded, though plug-ins in a
"category" subdirectory will still be preferred.  For example,
action_plugins/bar/foo.py would be preferred over action_plugins/foo.py.
 2013-05-24 17:05:28 -05:00
Michael DeHaan
753ebea186 Prefer categorized modules to uncategorized, such that if someone does an install on top of old content 
the categorized modules will win over the 1.1 uncategorized modules, as the packages may not automatically
clean up the old content.
 2013-05-19 20:09:44 -04:00
Michael DeHaan
cd57d59913 If ansible is configured to use a log file but cannot write to it, exit, but don't traceback. 2013-05-19 20:05:04 -04:00
Michael DeHaan
496f06c3c9 Pass variables to lookup function for those that want to use them. 2013-05-19 19:26:30 -04:00
Les Aker
1179d1bbd8 corrected indentation 2013-05-19 12:25:19 -04:00
Les Aker
2adc335481 ignore unicode errors in stdout 2013-05-19 11:57:08 -04:00
Michael DeHaan
f2a8c0d612 Fix listification inside of with_items so it runs more intelligently. 2013-05-13 21:31:45 -04:00
Michael DeHaan
9f47d13306 Misc identation. 2013-05-11 17:24:12 -04:00
Michael DeHaan
0a1657080b Indentation fix 2013-05-11 17:23:45 -04:00
Michael DeHaan
3fdf15fa8a template code fixes for 'make pep8' 2013-05-11 17:22:56 -04:00
Matt Coddington
542eeeb5d6 add option to ignore $legacy variable style substitution 2013-05-11 14:06:01 -04:00
Stoned Elipot
df3c4849e9 Also load Jinja2 extensions when processing template from string 2013-04-28 20:52:01 -04:00
Michael DeHaan
68f711d5ae teach plugin loader to find modules in subdirectories 2013-04-28 15:22:46 -04:00
Michael DeHaan
391fb98ee2 Allow modules to be categorized, and also sort them when generating the documentation. 2013-04-28 15:03:45 -04:00
Michael DeHaan
224e20ca60 complex_arg templating should be smarter. Make it so! 2013-04-25 21:11:17 -04:00
Jeroen Hoekx
ac7a632711 Remove leftover debug statement in template code. 2013-04-25 08:47:38 +02:00
Michael DeHaan
6fdfbb1a34 Improve variable smushing so it only has to be done in one place. This is related to shlex.split being called 
on untemplated variables in some rare cases.
 2013-04-24 22:00:40 -04:00
Michael DeHaan
be947e5266 Resolve merge conflict 2013-04-22 23:57:20 -04:00
Michael DeHaan
e12f91799c Allow args: var to be used to pass a variable in bare, and also templated versions should also DWIM. 2013-04-22 22:17:55 -04:00
Michael DeHaan
6c778acd91 Smush the braces in various places (hey, that rhymes) to avoid undo key=value splitting surprises 
in new template system.
 2013-04-22 22:05:06 -04:00
Michael DeHaan
d7623d1f91 Added a 'set_up' and 'tear_down' which are like tasks, but execute before and after roles. 2013-04-20 16:07:06 -04:00
Michael DeHaan
e6bf01a6b0 Make plugin loader path operations more efficient. 2013-04-20 12:31:14 -04:00
Michael DeHaan
817b0cdc80 Instantiate filter plugins only once to save some efficiency. 2013-04-20 09:51:20 -04:00
Michael DeHaan
53ac0bbec2 Instantiate callback plugins only once so we can set play/task objects on them and they'll stick. 2013-04-20 09:09:35 -04:00
Bernhard Weitzhofer
fb0a99e5d8 Fix if-statement that always evaluates True 2013-04-17 19:40:06 +02:00
Michael DeHaan
7c6341718e Merge branch 'combine_vars' of git://github.com/laggyluke/ansible into exp 
Conflicts:
	lib/ansible/inventory/vars_plugins/group_vars.py
	lib/ansible/runner/__init__.py
	lib/ansible/utils/__init__.py
	test/TestPlayBook.py
 2013-04-16 20:06:06 -04:00
Michael DeHaan
b54e955595 Remove a debug statement. 2013-04-16 19:09:12 -04:00
Michael DeHaan
86d47bce5f Make more lookup plugins tolerant of new variable system, with a little better 'do what I mean' logic to resolving 
what happens if you get a string back as a template result.
 2013-04-16 19:07:19 -04:00
Michael DeHaan
c0f8af5202 Make more lookup plugins happy with newstyle variables. Not quite done, but this fixes up with_items/with_nested/file/fileglob. 2013-04-16 18:50:30 -04:00
Michael DeHaan
7a2d493e67 Teach lookup plugins that if they can't evaluate something they can wait and do it later. 2013-04-12 18:44:40 -04:00
Michael DeHaan
3f3b2a9448 Smush Jinja2 braces in playbooks so unresolved variables get parsed nicely 2013-04-12 18:38:48 -04:00
Michael DeHaan
793a3d3f76 More 1.2 templating development; for legacy when_string constructs don't quote the 'in' operator 2013-04-12 13:29:49 -04:00
Michael DeHaan
b8c5a58b7f Avoid running through the legacy template code if no dollar signs are in strings. 2013-04-12 10:33:55 -04:00
Michael DeHaan
a05361f515 This is a fix on top of the 'airplane variable upgrade' commits that fixes legacy when_string so it evaluates correctly in the new eval construct. 2013-04-11 17:20:40 -04:00
Michael DeHaan
4e79bd0872 Remove unneccessary construction of Jinja2 environment object. 2013-04-11 12:59:33 -04:00
Michael DeHaan
2f5c1d3788 Merge pull request #2629 from stoned/fix-jinja2-filters-init 
Fix Jinja2 filter plugins initialization
 2013-04-11 09:57:04 -07:00
Michael DeHaan
695acc2de0 Make lookup plugins accessible in templates 2013-04-10 19:19:01 -04:00
Michael DeHaan
5b2035edd9 Changes for 'make pep8' 2013-04-10 19:12:10 -04:00
Michael DeHaan
81a926547c Some continued work on new-style templates and associated test code changes. Legacy template functions 
are marked with "legacy_" for possible future removal.
 2013-04-10 19:09:57 -04:00
Michael DeHaan
f0b21dcc0f allow references to names of variables in with_items without needing to surround them with Jinja2 '{{' delimeters 2013-04-10 18:42:54 -04:00
Michael DeHaan
9ac25bb8f6 Minor formatting 2013-04-10 18:19:31 -04:00
Michael DeHaan
d7206d84bb Allows Jinja2 that starts a YAML line to not cause a syntax error. 
Technically this isn't quite valid YAML when this happens, so we make it valid.  This means that if a future commander
API allows save/load it should make sure it does similar processing.
 2013-04-10 18:07:19 -04:00
Michael DeHaan
b09ef21ec9 Add code to flag legacy templating like $foo.{bar} as deprecated in favor of Jinja2 {{ foo.bar }} so we 
can remove the legacy system at a later date.
 2013-04-10 17:52:35 -04:00
Michael DeHaan
804056a563 Use Jinja2 strict undefined in string templating to allow the default filter to be used. 2013-04-10 16:45:53 -04:00
Michael DeHaan
998230a84a Allow $foo and {{ bar }} to be used on the same line in playbooks. 2013-04-10 16:40:49 -04:00
Michael DeHaan
29209c4913 Style fixes so "make pep8" is clean. 2013-04-10 16:37:49 -04:00
Michael DeHaan
0113951580 Enable usage of when_set within new eval system. 2013-04-10 16:26:59 -04:00
Michael DeHaan
a83e10d77d Use safe_eval vs eval. 2013-04-10 16:17:24 -04:00
Stoned Elipot
154f58f82d Fix Jinja2 filter plugins initialization 
_get_filter_plugins() checks FILTER_PLUGINS against None hence
the latter should be initialized to None.
 2013-04-09 22:38:24 +02:00
Sébastien Bocahu
b94bf051d5 Makes $PIPE and $FILE macros accept utf-8 input 2013-04-06 23:28:15 +02:00
Michael DeHaan
892484812e Much requested feature -- allows relative imports of content within roles or relative to any task or handler include (../templates for template ../files for copy) 2013-04-06 12:13:04 -04:00
Michael DeHaan
95f30f0def Complete streamlining of vars handling in playbooks and how those are templated to avoid 
repeat template calls at playbook intialization time.
 2013-04-06 10:45:09 -04:00
Michael DeHaan
4cd69e81b9 Catch recursive templating errors and display what string caused them. 2013-04-06 09:55:31 -04:00
George Miroshnykov
6826aa7360 Tweaked merge_hash to also affect Runner behavior 2013-04-06 13:06:38 +03:00
Michael DeHaan
f585c4cde7 Upgraded variable support met with upgraded conditional support, see examples/playbooks/upgraded_vars.yml 
for details!
 2013-04-05 19:10:32 -04:00
Michael DeHaan
38c2b14339 Undefined Jinja2 statements are returned as they originally are so you can tell there are things to 
correct.
 2013-04-05 17:36:53 -04:00
Michael DeHaan
cdaa2085ee Preliminary ability to use Jinja2 {{ }} to replace ${foo.bar} in playbooks. Can't use both at the same time per line. 2013-04-03 01:04:16 -04:00
Stoned Elipot
8edda38c61 exception safe list/tuple replacing for non-str values 2013-03-12 05:01:45 +01:00
Michael DeHaan
7ac5e462ef Fixed a small buglet, if using with_items with yum and so on, only optimize the package list if the package list is all strings 2013-03-01 18:32:32 -05:00
Daniel Hokka Zakrisson
f1eb195ff5 vars_loader should get the path to the inventory + vars_plugins 2013-03-01 23:22:52 +01:00
Daniel Hokka Zakrisson
4807fbc8b7 Use regular strings to allow tests to work 2013-02-28 13:52:57 +01:00
Daniel Hokka Zakrisson
cedfec763a jsonify needs to return a string of {}, rather than a dict 2013-02-27 19:46:31 +01:00
Daniel Hokka Zakrisson
bcf7a2c53a Catch all exceptions coming from lookup plugins 
Fixes using $TEMPLATE() and hostvars in a task without a name, among
other things.
 2013-02-27 10:11:14 +01:00
Michael DeHaan
1366c663eb Merge branch 'copy-diff-take2' of git://github.com/stoned/ansible into better_diff 
Conflicts:
	library/file
 2013-02-26 20:51:32 -05:00
Stoned Elipot
8816dc7ca7 Make diff header lines more explicit about what the diff is about 
This gives a more readable output when producing diff for a task
with multiple items (with_items).
 2013-02-26 16:53:59 +01:00
Stoned Elipot
10e9f1fc1e Implement --diff for the copy module. 2013-02-25 23:32:52 +01:00
Daniel Hokka Zakrisson
1df56c07d3 If expand_lists is true, make lookup plugin result into a string 
Fixes #2196.
 2013-02-25 22:26:16 +01:00
Daniel Hokka Zakrisson
f03e845920 Allow hyphens in complex variables 
Primarily to support ${hostvars.hostname-with-hyphens.<var>}.
 2013-02-25 15:09:44 +01:00
Michael DeHaan
b75b9681a8 more places to use yaml.safe_load 2013-02-23 13:34:14 -05:00
Michael DeHaan
a9ea3136cf Use yaml.safe_load as we are just using basic data structures 2013-02-23 13:33:21 -05:00
Michael DeHaan
e51707711c Merge pull request #2120 from jpmens/doc_ex1 
Add support for additional EXAMPLES string in Ansible modules
 2013-02-23 08:58:34 -08:00
Stoned Elipot
9f2bba01ba Fix diff output vertical spacing 2013-02-20 22:45:45 +01:00
Jan-Piet Mens
396a07bcc7 Add support for additional EXAMPLES string in Ansible modules 
return DOC and EXAMPLES as a list
add moduledev explanation
more
 2013-02-18 20:02:46 +01:00
Michael DeHaan
9cf66f4376 Fixes from 'make pep8'. Partial, more to come. 2013-02-17 19:40:38 -05:00
Michael DeHaan
61d01f549f Show a nicer message when attempting to diff unicode files. 2013-02-17 19:32:28 -05:00
Michael DeHaan
1ecf4a6943 Working on complex argument support. 2013-02-17 15:01:49 -05:00
Michel Blanc
0cd0a7fda3 Fixes jina typos 
Moved *jina* to *jinja2*
 2013-02-16 13:32:48 -05:00
Michel Blanc
1c22f2146e Adds configurable jinja2 extension loading 
Jinja extensions adds features to the jinja2 templating engine. This
patch allows module loading for the templating engine vian an
ansible.cfg configuration key (jinja_extensions).
The default behaviour doesn't change (no module loading).
Requested modules can be added coma separated in ansible.cfg

Adds whitespace handling in jinja_extension config

Added whitespace handling in jinja_extension configuration directive, so
things stay safe if user adds spaces around comas in the directives
list.

Adds config example for jinja_extensions

Added config example with multiple extentions for jinja_extensions
 2013-02-16 13:32:48 -05:00
Daniel Hokka Zakrisson
d632210941 Allow using other users' home directories as well 2013-02-11 23:43:30 +01:00
Daniel Hokka Zakrisson
c83e428a7e Default expand_lists to True and set it to False for only_if 
Fixes #2026 and #2027.
 2013-02-10 22:57:53 +01:00
Michael DeHaan
e6ead2ca74 make things like $FILE(/etc/path/foo.conf) and $ENV(HOME) work without having to use brackets to index them 2013-02-09 22:35:27 -05:00
Michael DeHaan
c692de6b80 Cleanup YAML parse error warning code a tiny amount. 2013-02-09 14:30:19 -05:00
Michael DeHaan
a9162a86f2 Very basic --diff option for showing what happens when templates change. 
Probably output is not useful if not used with --limit

Works well with --check mode
 2013-02-07 22:52:25 -05:00
Daniel Hokka Zakrisson
70d5dad726 Also catch NameErrors which would indicate missing quotes 2013-02-07 11:56:59 +01:00
Daniel Hokka Zakrisson
bc709e7b67 expand_lists should default to False 2013-02-07 11:56:59 +01:00
Rune Kaagaard
7a8b27f716 Fixing bug with unicode templates. 
The utils.md5s() function would break when calculating checksums
for non-ascii characters. Convert to utf-8 first.
 2013-02-05 14:49:59 +01:00
Daniel Hokka Zakrisson
c1b63d1500 Fix for when conditional is a simple bool already 
Fixes #1983.
 2013-02-04 20:12:53 +01:00
Michael DeHaan
fed82c2188 This implements a basic --check mode which for now is only implemented on template & copy operations. More detail will be shared with the list 
shortly.
 2013-02-03 20:34:13 -05:00
Daniel Hokka Zakrisson
a79373f6b2 Make template_ds the only templater 
Instead of having to remember when to use which one, rename template_ds
to template and move the last bit of code from template to varReplace
(which gets used for all string replacements, in the end).

This means that you can template any data type without worrying about
whether it's a string or not, and the right thing will happen.
 2013-02-03 14:01:54 +01:00
Daniel Hokka Zakrisson
b79960e13b If failed lookups are fatal, re-raise the exception 
Fixes #1938.
 2013-01-29 10:31:33 +01:00
Daniel Hokka Zakrisson
5268d49bad Add sudo_flags configuration option to alter sudo behaviour 
Default to -H to set $HOME appropriately.
 2013-01-28 17:41:43 +01:00
Michael DeHaan
36066d8664 Fixup ec2_facts docs parsing 2013-01-26 12:34:30 -05:00
Daniel Hokka Zakrisson
53fd85e2c4 Merge pull request #1903 from leucos/mergeable-hash-vars 
Adds user-selectable hash merging support in vars
 2013-01-25 08:29:05 -08:00
Daniel Hokka Zakrisson
864b75e54b Override Jinja2 Template class to make {% include %} work again 
Fixes #1908.
 2013-01-25 14:16:29 +01:00
Michel Blanc
8eb7d740b0 Fixes hash merging 
No need for deep copy (vars are essentially immutable once loaded, there
should not be any modifications)
 2013-01-24 00:53:12 +01:00
Michel Blanc
e28e538c6e Adds user-selectable hash merging support in vars 
Hash variables are currently overriden if they are redefined. This
doesn't let the user refine hash entries or overriding selected keys,
which can, for some, be a desirable feature.
This patch let the user force hash merging by setting the
hash_behaviour value to "merge" (without the quotes) in ansible.cfg

However, by default, ansible behaves like it always did and if any value
besides "merge" is used ("replace" is suggested in the example ansible.cfg
file), it will also behave as always.
 2013-01-23 21:39:34 +01:00
Bowe Strickland
2b3d6d4545 protect PluginLoader._extra_dirs from appending None 
PluginLoader.add_directory() can receive None from, for example, 
Inventory.add_directory(self.basedir()) if host_list is a custom list.
None has no reasonable interpretation other than ignore it.
 2013-01-23 13:55:12 -05:00
Daniel Hokka Zakrisson
a16ddb57c1 Default module search path is included already 
Adding it to runner's module_path makes it override local modules.
 2013-01-22 15:42:49 +01:00
Michael DeHaan
35c7ebf7a4 Revert "Update lib/ansible/utils/__init__.py" 
Reported hanging of no-password sudo in some cases.  Need to explore.

This reverts commit 87f6739e20.

Conflicts:

	lib/ansible/utils/__init__.py
 2013-01-20 09:05:07 -05:00
ron1
280660b8a7 Support sudo alternatives that offer sudo-compatible interfaces 2013-01-19 08:40:32 -05:00
Michael DeHaan
c8fc353bc3 Merge pull request #1811 from fdavis/devel 
add when_{failed,changed}, and extended when_{set,unset}
 2013-01-18 15:18:00 -08:00
Michel Blanc
87f6739e20 Update lib/ansible/utils/__init__.py 
Adds -i to  make_sudo_cmd so target user's environment gets loaded when configurationslike this are used :


    - hosts: ubuntu 
      name: Install ruby for the configured ruby user 
      sudo: True 
      sudo_user: rubyuser 
      # should be ${ruby_user}, but can't for now because of #1665 
      tasks: 
      - name: Gets current ruby version 
        action: shell rbenv version 
        register: ruby_current_version
 2013-01-18 16:03:50 +01:00
Daniel Hokka Zakrisson
7ecab22302 Move sudo command making to one common function 2013-01-13 15:16:13 +01:00
Daniel Hokka Zakrisson
7782923ea2 Revert #1818 but avoid double-dwim, fixing relative fileglob 2013-01-09 14:52:52 +01:00
Daniel Hokka Zakrisson
87b2378e22 Resolve variable references inside variables 
Fixes the case where variable x is '$y' and y is a dict(foo='bar') and
an attempt to access ${x.foo} is made.
 2013-01-09 13:45:55 +01:00
fdavis
fe310dcff1 add when_failed, when_changed, and extended when_set/unset 
This commit extends the 'when_' conditions to failed and changed
json results

Additionally it makes when_{set,unset,failed,changed,int,str,flt}
behave more similiarily in that they all except and/or/not logic
 2013-01-08 19:51:48 -08:00
willthames
411b2bf7d9 Added additional template variables 
Added two additional template variables
* template_fullpath - absolute path to the template
* template_run_date - date that the template was rendered
Documented these additional variables in the module documentation
 2013-01-04 16:36:02 +10:00
Daniel Hokka Zakrisson
caee51e90e Allow only_if/when_* on task includes and apply it on all tasks within 2013-01-04 00:15:13 +01:00
Stephen Fromm
2100a35663 Update path_dwim() to return absolute path 
If path_dwim() is provided a relative path to a file, it will now return an
absolute path of the playbook directory + the relative file path.
 2013-01-02 21:53:00 -08:00
Daniel Hokka Zakrisson
d4c63e3300 Ensure each basedir is only added to the search path once 
Fixes #1790.
 2012-12-20 14:17:12 +01:00
Daniel Hokka Zakrisson
3a36c024da Make lookups being fatal up to the caller 
Fixes #1769.
 2012-12-19 19:19:04 +01:00
Daniel Hokka Zakrisson
0f1706220b Add support for using the Jinja2 built-ins such as range 2012-12-19 09:42:15 +01:00
fdavis
7347e54b70 change error message on check_conditional when variable does not exist 2012-12-13 23:02:30 -08:00
Michael DeHaan
dbf5a57a5a Merge pull request #1683 from bcoca/template_override 
Template override
 2012-12-02 10:15:10 -08:00
Jan-Piet Mens
17f31a2a79 CLI: ansible-doc shows lists of modules & module docs on command-line 
check path is directory
added manpage & setup
small cleanup
shut up module_formatter in utils to avoid trace print on crud files in library
 2012-11-30 21:57:25 -05:00
Brian Coca
d7f38d07b3 fixed bug for string size mismatch, now substring depends on size of match string Signed-off-by: Brian Coca <briancoca+ansible@gmail.com> 
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
 2012-11-26 10:41:13 -05:00
Brian Coca
6a1e2aaff5 moved override matching string to variable changed test template to match Signed-off-by: Brian Coca <briancoca+ansible@gmail.com> 
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
 2012-11-26 10:41:13 -05:00
Brian Coca
68f5d69365 added ability to override jinja enviornment from first line of template Signed-off-by: Brian Coca <briancoca+ansible@gmail.com> 
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
 2012-11-26 10:41:13 -05:00
Daniel Hokka Zakrisson
047d089cea Restore git output on --version 
Broken by the move from utils.py to utils/__init__.py
 2012-11-21 23:54:42 +01:00
Daniel Hokka Zakrisson
f95fefd8c5 Use plugin system to find modules 2012-11-18 19:09:21 +01:00
Daniel Hokka Zakrisson
5dd2ec2cae Add a way to add directories to just one type of loader 2012-11-18 19:08:59 +01:00
Daniel Hokka Zakrisson
11175781b8 Use slurp for fetch is sudo is enabled and needed 
Fixes #1020.
 2012-11-18 17:54:00 +01:00
Daniel Hokka Zakrisson
e74ffd6764 Lookup plugin arguments need to be templated 2012-11-14 11:17:30 +01:00
Daniel Hokka Zakrisson
c200c26ced Keep hostvars from being templated 2012-11-13 11:34:34 +01:00
Daniel Hokka Zakrisson
25a8787e95 Template all variables before returning them to Jinja2 2012-11-13 02:39:33 +01:00