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
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
