wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
12647 commits 42 branches 295 tags 186 MiB
Commit graph

3349 commits

Author SHA1 Message Date
Trond Hindenes
72760f5999 All changes referenced in PRs #8767 , #8768 , #8769 : 
This changes the get-attr function slightly, and lets the module specify whether a param is needed and auto-fails if it is not present. A module can now verify params like so::
 $params = Parse-Args $args;
 $result = New-Object psobject;
 Set-Attr $result "changed" $false;
 $path = Get-Attr -obj $params -name path -failifempty $true -resultobj $result

or

$params = Parse-Args $args;
 $result = New-Object psobject;
 Set-Attr $result "changed" $false;
 $path = Get-Attr -obj $params -name path -failifempty $true -emptyattributefailmessage "Oh man. You forgot the main part!" -resultobj $result

slight tweak in how the powershell module converts to json in order to support nested objects (allows for more complex facts, among others)

This script gathers some extended facts on windows hosts in a json array attribute called "ansible_interfaces". This info is needed for some network-related modules I'm working on. Required the update to powershell.ps1 to return deeply nested json objects.
 2014-08-29 10:39:42 +02:00
James Cammarata
dbc980eaf4 Merge branch 'mischapeters-devel' into devel 2014-08-28 20:31:00 -05:00
Chris Church
2ddab7affc Merge pull request #8793 from cchurch/powershell3_compat 
Replace Get-FileHash with MD5 code that works on PowerShell 3.
 2014-08-28 21:25:06 -04:00
James Cammarata
70ff6d35aa A10 module improvements 
* moved common code to an module_util snippet
* rewrote logic to make each module idempotent
* added new capabilities like the write_config option
 2014-08-28 20:23:48 -05:00
Michael DeHaan
b7082677de Merge pull request #8790 from sivel/issue/8784 
Don't use ternary if statements. Fixes #8784
 2014-08-28 10:48:32 -04:00
James Cammarata
7fbdbcdec7 Default fetch_url to use TLSv1 instead of SSLv2/3 2014-08-28 08:45:01 -05:00
James Cammarata
ab495d1916 Set the shell variable on the ssh connection type for accelerated mode 
Fixes #8799
 2014-08-28 08:22:24 -05:00
James Cammarata
99ba9d6e24 Default fetch_url to use TLSv1 instead of SSLv2/3 2014-08-28 08:22:24 -05:00
Chris Church
0d1197a995 Replace Get-FileHash with MD5 code that works on PowerShell 3. 2014-08-28 01:42:22 -04:00
Matt Martz
2b307985bc Don't use ternary if statements. Fixes #8784 2014-08-27 19:16:48 -05:00
James Cammarata
a6ad374668 Use split_args directly to check for omitted params 2014-08-27 11:51:03 -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
fe88ba7c8d Undo changes to filter module 2014-08-27 10:04:47 -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
bce6642ab6 Implement default omit correctly 2014-08-27 10:03:07 -05:00
Victor Lin
0b4d7f1574 Implement default omit filter 2014-08-27 10:03:07 -05:00
James Cammarata
ed34cee36f Atomically move known hosts file into place for paramiko connections 
Redo of original patch, which adds an additional check to ensure the
known_hosts file isn't trampled when host_key_checking is disabled.

Fixes #8169
 2014-08-26 16:02:59 -05:00
James Cammarata
811ff49f78 Updating CHANGELOG for new symbolic mode feature and updating file docs 2014-08-25 23:47:41 -05:00
James Cammarata
c21c66c740 Merge branch 'file_symbolic_mode' of https://github.com/pbitty/ansible into pbitty-file_symbolic_mode 2014-08-25 19:38:44 -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
Chris Church
57dee4545b Make sure cmd is UTF8 encoded before splitting. Fixes regression introduced by 80df2135e9. 2014-08-24 21:06:21 -04:00
Michael DeHaan
a419ffdf41 Make command warnings off by default to minimize surprises. 2014-08-22 16:12:48 -04:00
Michael DeHaan
b44e22aa68 Merge pull request #8722 from cmbaughman/devel 
Bugfix: #8720 winrm.py: protocol.send_message() crashes with https
 2014-08-22 15:53:09 -04:00
Michael DeHaan
fcb610dec4 Slightly trim down the warnings list based on some things being pretty common 
for local usage.
 2014-08-22 15:37:07 -04:00
Will Thames
ab8490d003 Added warnings to command module 
Generate warnings when users are shelling out to commands
rather than using modules

Can be turned off on a per-action line with the documented
warn=False flag. Can be turned off globally using
command_warnings = False in ansible config file.

Print out warnings using the standard playbook callbacks.

Created some additional tests in TestRunner.test_command
and also a demonstration playbook.
 2014-08-22 15:37:07 -04:00
Chris Baughman
07f12539ee Bugfix: #8720 winrm.py: protocol.send_message() crashes with https 2014-08-22 15:09:48 -04:00
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
James Cammarata
3b19b83806 Add GovCloud region to list of regions for AWS 
Fixes #8604
 2014-08-21 16:12:51 -05: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
1803976a40 Ensured that role version can be specified in role dependencies 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
Will Thames
b550cb9bc3 Need to take URLs into account when running playbooks too 
Ensure that if meta/main.yml has dependencies containing URLs
these are correctly resolved at playbook runtime.

Update role_name during run time so that output of e.g. task names
look sensible
 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
ea5db1818d Merge branch 'role_path_var' of https://github.com/sergevanginderachter/ansible into sergevanginderachter-role_path_var 2014-08-21 14:14:32 -05:00
James Cammarata
24c4277479 Remove tabs added from 677de07 2014-08-21 14:07:18 -05:00
James Cammarata
5e240fec71 Merge branch 'devel' of https://github.com/l1k/ansible into l1k-devel 
Conflicts:
	test/integration/roles/test_copy/tasks/main.yml
 2014-08-21 13:56:26 -05:00
James Cammarata
b81e77cfec Tweak error language in dict validation 2014-08-21 13:24:53 -05:00
Serge van Ginderachter
3a228b9d55 InventoryScript: better syntax checking for json stream 2014-08-21 18:06:07 +02: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
Serge van Ginderachter
7051cdeb57 roles: make role_path (path of current role) available as variable to the task 2014-08-21 11:56:27 +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
Serge van Ginderachter
a1f09bd89f Merge variables for hosts instead of updating in get_variables() 2014-08-20 01:54:46 -05:00
James Cammarata
cecfede85f Merge remote-tracking branch 'svg/issue_8621_8664' into svg_issue_8621_8664 2014-08-19 11:37:59 -05:00
James Cammarata
d4ff0d125a Make sure password files from lookups are created with restrictive permissions 
Also adds checks for the lookup integration test for passwords.

Fixes #8652
 2014-08-19 11:30:04 -05:00
James Cammarata
3a7aca6066 Fix no_log value for content in common file args settings 
Also adds a test to ensure the content value is not logged.

Related to #8647
 2014-08-19 10:47:18 -05:00
James Cammarata
8a5675ca9f Fixing no_log for the playbook level use 
Fixes #8647
 2014-08-19 10:35:01 -05:00
Serge van Ginderachter
0ab721d51e better logic for all-group variables for implicit localhost 2014-08-19 16:41:51 +02:00
Serge van Ginderachter
3c06833302 group_by: make sure new group has bigger priority than all group 2014-08-19 16:34:30 +02:00
Serge van Ginderachter
a2cfe8770b Inventory: fix logic mistake in loading/retrieving variables for groups 2014-08-19 16:34:26 +02:00
James Cammarata
ca6db40cb4 When serializing inventory, pop from the start of the hosts list 
Fixes #8646
 2014-08-19 09:04:47 -05:00
James Cammarata
c8494cdc39 Set prompt encoding to a sane value when sys.stdout.encoding is None 
Fixes #8644
 2014-08-18 22:04:25 -05:00
James Cammarata
379e31883c Fix check mode issues with copy module 
Fixes #8639
 2014-08-18 16:02:45 -05:00
James Cammarata
542f07128e Correct check for role library/ existence 
Fixes #8633
 2014-08-18 13:33:23 -05:00
James Cammarata
e3895840d1 Make sure group_vars/all is loaded for ungrouped hosts 
Fixes #6563
 2014-08-18 12:29:46 -05:00
Lukas Wunner
677de07f44 Try optimistic chown, do not error out if not permitted to chown 
Add unit test
 2014-08-17 22:08:45 +02:00
James Cammarata
8dafacd4e9 Make env param a dict type instead of list 
Also modifies param type checking code to remove whitespace from
around params before splitting them into k=v pairs.

Fixes #8199
 2014-08-15 11:04:27 -05:00
Michael DeHaan
3035f2dcc8 Merge pull request #8367 from msabramo/make_pip_install_editable_work 
Make `pip install -e` work
 2014-08-15 07:46:54 -04:00
James Cammarata
54cbe3dcf9 Disallow args: to be specified as a string 2014-08-14 16:05:20 -05:00
James Cammarata
600a4657b4 Catch error in atomic_move when creating temporary file 
Fixes #8480
 2014-08-14 13:26:24 -05:00
James Cammarata
ee18c557ec Load group_vars for new groups loaded via add_host 
Fixes #8605
 2014-08-14 13:18:26 -05:00
James Cammarata
b4476c238f Use match() instead of search() for pattern matching 
Also related to f48fa3, fix for #8614
 2014-08-14 12:26:52 -05:00
James Cammarata
f48fa3759a Fix host pattern matching and enhance error detection 
Fixes #8614
 2014-08-14 12:13:40 -05:00
James Cammarata
a01d97f12b Fixing variable name bug introduced in ac8950f 
Fixes #8617
 2014-08-14 10:55:26 -05:00
James Cammarata
bea0845322 Fix vault_password positional args error 2014-08-14 10:28:08 -05:00
Lukas Wunner
f4053fcf3a Only chown on atomic move if invoked as root 
Linux and BSD derivatives do not allow unprivileged users to
"give away" files to others for security reasons. (System V
derivatives allow that but they're rare nowadays.)
 2014-08-14 16:56:11 +02:00
Cristian Ciupitu
b6261d05b0 Fix typo: & -> and 
`and` is the boolean operator for AND in [Python][1].
`&` is the bitwise operator for AND in [Python][2].

[1]: https://docs.python.org/2/reference/expressions.html#boolean-operations
[2]: https://docs.python.org/2/reference/expressions.html#binary-bitwise-operations
 2014-08-14 16:52:59 +03: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
James Cammarata
fc7859f445 Make sure playbook_dir variable is an absolute path 
Fixes #8317
 2014-08-12 09:51:44 -05:00
James Cammarata
4940a7ad77 Merge pull request #8458 from Jmainguy/runner_8404 
Fixes 8362, returns stderr if No space left on device
 2014-08-11 23:16:57 -05:00
James Cammarata
ac8950fd36 Set special vars in play.vars rather than load_vars 
Also refactors playbook loading code relating to vars in playbooks
to a sub-function.

Fixes #8534
 2014-08-11 19:23:54 -05: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
James Cammarata
783a1e3dfc Fixing broken patch 20957a1 
Also adds integration tests for nested includes with conditionals
 2014-08-11 14:58:48 -05:00
Michael DeHaan
02b0e102e6 Rename some INI keys for fact caching defaults 2014-08-11 15:16:51 -04:00
James Cammarata
20957a1b85 Remove duplicate compiling of task when: statements 
Fixes #8538
 2014-08-11 13:23:07 -05:00
James Cammarata
83fa9a8cde Make sure we only use unquote on quoted lines in lineinfile when needed 2014-08-11 11:23:52 -05:00
Michael DeHaan
542aaa6ffe Use JSON instead of pickles for compatibility. 2014-08-11 12:23:05 -04:00
Michael DeHaan
2629cd3fce Fix some copyrights, fix a misc test. 2014-08-11 12:23:05 -04:00
Michael DeHaan
533fb21586 Add copyright header, let me know if corrections are needed. 2014-08-11 12:23:05 -04:00
Michael DeHaan
bdee1ff24e Standardize exception handling 2014-08-11 12:23:05 -04:00
Josh Drake
a620ef414e Implement connection pooling for memcached cache plugin. 2014-08-11 12:23:05 -04:00
Josh Drake
3031247492 Use cPickle in redis fact caching backend. 2014-08-11 12:23:05 -04:00
Josh Drake
917e868f65 Implement fact cache flushing alongside a command-line argument to invoke it. 2014-08-11 12:23:05 -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
Michael DeHaan
56f9328f93 Merge 2014-08-11 12:22:47 -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
James Cammarata
a650421e39 Catch task parameter splitting errors nicely 
Fixes #8481
 2014-08-11 10:16:58 -05:00
James Cammarata
9f34ea54f5 Correct parser to ignore escaped quotes when not in quotes already 
Related to #8481
 2014-08-11 10:16:58 -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
Michael DeHaan
e01d5f9d84 Revert "Added cross-platform uptime fact" since causing failures on Ubuntu. 
This reverts commit 14a9966984.

Conflicts:

	lib/ansible/module_utils/facts.py
 2014-08-08 14:58:09 -04:00
Michael DeHaan
ea53576759 Merge pull request #6777 from GuiGui2/devel 
Setup module: Additional facts when using ansible with Linux on System z
 2014-08-08 14:30:49 -04:00
Michael DeHaan
5d05049ee1 Merge pull request #7670 from dagwieers/patch-3 
Added cross-platform uptime fact
 2014-08-08 14:23:53 -04:00
Michael DeHaan
c56ce4c913 Merge pull request #8334 from veeti/cfg-vars 
Expand variables in configuration files, take two
 2014-08-08 14:23:11 -04:00
Michael DeHaan
a48328fa12 Merge pull request #7725 from slapers/network-secondaries-issue 
fix incorrect secondary ip handling, fixes #7724
 2014-08-08 13:50:52 -04:00
hoettle
4243ce61b3 Correct placement of right parenthesis. 
(serial_pct)/100.0 is a typo - the parentheses should be around the entire percentage calculation, which makes much more sense when multiplying by the number of hosts (luckily BODMAS prevailed).
 2014-08-08 13:46:57 -04:00
Howard Oettle
cbf0bd6baf playbook: permit the serial attribute to be a pecentage string as well as well as a straight integer 2014-08-08 13:46:57 -04:00
James Cammarata
63bf2f6d9a Preserve all line breaks in literal blocks 
Fixes #8512
 2014-08-08 12:11:15 -05:00
Michael DeHaan
d0205b2878 Merge pull request #8500 from sivel/rax-de-dupe 
rax: Move additional shared code into module utils
 2014-08-08 12:33:35 -04:00
Michael DeHaan
03d150de35 Merge pull request #8020 from msabramo/error_when_private_key_file_permissions_incorrect 
Error if private_key_file is group/world readable
 2014-08-08 12:33:07 -04: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 Peters
3ba516ac25 adding min() and max() filters for use in Jinja templates 2014-08-08 11:28:48 -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
Michael DeHaan
66eddfd491 Merge branch 'nova-compute-enhancements' of git://github.com/emonty/ansible into devel 
Conflicts:
	lib/ansible/module_utils/openstack.py
	library/cloud/nova_compute
 2014-08-08 11:05:13 -04:00
Michael DeHaan
b413a7d7f3 Merge pull request #8449 from emonty/feature/openstack-auth-handling 
Handle auth arguments across openstack modules consistently
 2014-08-08 10:56:21 -04:00
Michael DeHaan
2f7d405fd9 Merge pull request #8510 from sergevanginderachter/inventorydir_yacc 
InventoryDir: fixing yet another corner case
 2014-08-08 10:34:03 -04:00
Serge van Ginderachter
7c96f1d803 InventoryDir: fixing yet another corner case 2014-08-08 08:54:11 +02:00
James Cammarata
d4cedfc7f1 Fix missing variable initialization for async jid 
Fixes #8491
 2014-08-07 23:51:28 -05:00
Michael DeHaan
fc40e6be81 Merge pull request #8488 from bekimb/docstring_basic_module 
Keep docstring up to date with the code in basic module
 2014-08-07 17:48:57 -04:00
James Cammarata
e19ed3424d Make sure default vars are used in template calls for tasks 
Fixes #8499
 2014-08-07 13:28:09 -05:00
James Cammarata
4a157a72a0 Catch auth errors in winrm and properly raise errors 
Fixes #7875
 2014-08-07 09:00:24 -05:00
Bekim Berisha
5272e1099d Keep docstring up to date with the code in basic module 2014-08-07 13:40:57 +02:00
Matt Martz
7d0eba19ab Dedupe PTR record related code in rax_dns_record 2014-08-06 16:47:33 -05:00
Matt Martz
88acb48753 Add ANSIBLE_VERSION to module_utils/basic.py and manipulate the pyrax user-agent 2014-08-06 16:28:42 -05:00
Matt Martz
585fd5a138 Move additional rackspace common code into module_utils/rax.py 2014-08-06 16:26:48 -05:00
James Cammarata
ba4693051b Removing leftover import of atomic_move 2014-08-06 15:38:08 -05:00
James Cammarata
efbad90ef8 Revert "Atomically move known hosts file into place when edited by paramiko connections" 
This reverts commit bd49a835b4.
 2014-08-06 15:31:54 -05:00
James Cammarata
a45c3b84f3 Avoid templating raw lookup strings 2014-08-06 13:25:14 -05:00
James Cammarata
d134b8a83c Version bump for 1.8 2014-08-06 13:17:28 -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
dc69510bff Merge branch 'callback_template_delegate' of https://github.com/sergevanginderachter/ansible into sergevanginderachter-callback_template_delegate 2014-08-05 15:15:03 -05:00
James Cammarata
eeec459f8a Merge branch 'sets_v2' of https://github.com/bcoca/ansible into bcoca-sets_v2 2014-08-05 14:58:01 -05:00
Jonathan Mainguy
535ebc4c56 Fixes 8362, returns stderr if No space left on device 2014-08-05 15:18:49 -04:00
Serge van Ginderachter
8f39c114d8 template Runner.module_vars['delegate_to'] to accommodate callbacks 2014-08-05 15:16:43 +02:00
Monty Taylor
4012272fa2 Add common auth handling across openstack modules 
Taking a page out of the ec2 config, make sure that all of the
OpenStack modules handle the inbound auth config in the same way.
The one outlier is keystone wrt auth_url.
 2014-08-04 20:55:30 -07:00
James Cammarata
5d0bb33ede Make run_command process communication smarter 
The run_command module function will now poll stdout/stderr for
data rather than using the builtin command communicate(), which can
hang under certain circumstances.

Fixes #7452
Fixes #7748
Fixes #8163
 2014-08-04 15:32:41 -05:00
James Cammarata
74cbeb1292 Default interface type to ipv4 when checking flags for Solaris 
Fixes #8330
 2014-08-04 13:36:37 -05:00
James Cammarata
bd49a835b4 Atomically move known hosts file into place when edited by paramiko connections 
Fixes #8169
 2014-08-04 13:08:40 -05:00
Michael DeHaan
7ff63ab754 Revert "Use atomic move function on known host file in paramiko to prevent rare occurance of Control-C" 
This reverts commit 642b183fb6.
 2014-08-04 13:11:40 -04:00
James Cammarata
af0d8cda7b Fix literal block multiline parsing 
Fixes #8394
 2014-08-04 11:10:07 -05:00
James Cammarata
6d94ae64ec Remove unnecessary unicode conversions from parse_kv 
Fixes #8425
 2014-08-04 09:59:08 -05:00
Michael DeHaan
642b183fb6 Use atomic move function on known host file in paramiko to prevent rare occurance of Control-C 
during file operations.
 2014-08-04 10:50:14 -04:00
Michael DeHaan
a7d2e729f8 Add some whitespace to make paramiko_ssh more browseable 2014-08-04 10:38:16 -04:00
Michael DeHaan
24f6f656cc Merge branch 'bug8392' of git://github.com/gnosek/ansible into devel 2014-08-04 10:22:29 -04:00
Monty Taylor
a05804bf8d Update the nova inventory plugin with new ip code 
The provisioning module knows more about how nova deals with IP
addresses now. Ensure that the inventory module is similarly as smart
by separating out the logic into the openstack/module_utils.
 2014-08-02 22:31:27 -07:00
Monty Taylor
d17a1b5c19 Add common auth handling across openstack modules 
Taking a page out of the ec2 config, make sure that all of the
OpenStack modules handle the inbound auth config in the same way.
The one outlier is keystone wrt auth_url.
 2014-08-02 17:39:19 -07:00
Luke Sneeringer
a4fce4818e Add support for environment variables in GCE module. 2014-08-01 11:44:58 -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
9c1a89ff4e Merge branch 'patch-1' of https://github.com/debfx/ansible into debfx-patch-1 2014-07-31 11:41:21 -05:00
Marc Abramowitz
44b9f5e752 Make pip install -e work 
This allows `pip install -e` and `python setup.py develop` to work
without having to do the stuff in
http://docs.ansible.com/intro_installation.html#running-from-source so
it's a tad nicer for Python programmers who are accustomed to installing
packages as editable/in development mode.

Fixes GH-8355 (https://github.com/ansible/ansible/issues/8355)
 2014-07-30 13:35:11 -07:00
James Cammarata
7a5076c8b8 Catching shlex splitting error in fact gathering get_cmdline call 
Fixes #8352
 2014-07-30 14:47:50 -05:00
James Cammarata
80df2135e9 Fix parsing of tasks with variable module names 
Also adding an integration test for same.
 2014-07-30 14:18:06 -05: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
Veeti Paananen
5780f3a8b4 Expand variables in configuration files, take two 
e.g. $HOME.
 2014-07-29 15:20:59 +03:00
Veeti Paananen
e6bd049892 Don't expand remote_tmp path locally 2014-07-29 15:19:54 +03: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
6e814566de Unquote params passed to an include statement 
Fixes #8315
 2014-07-28 16:35:52 -05:00
Michael DeHaan
106f4ccc01 Revert "Expand variables in configuration files" - I feel I've been here before. 
Breaks some test runs.

This reverts commit a9eef029b6.
 2014-07-28 17:10:42 -04:00
Michael DeHaan
97fa9502aa Merge pull request #8309 from veeti/cfg-vars 
Expand variables in configuration files
 2014-07-28 15:47:45 -04:00
Michael DeHaan
645ab7baff Merge pull request #7950 from mesk41in/devel 
Fix unsupported regexp parameter in assemble
 2014-07-28 12:01:12 -04:00
Michael DeHaan
fb60e767a7 Taking alternate approach. 
Revert "Fix hostname when get_distribution_version() returns a string."

This reverts commit 08f97c0b9d.
 2014-07-28 11:35:33 -04:00
Michael DeHaan
628d828876 Merge pull request #8087 from neersighted/string_version 
Fix hostname when get_distribution_version() returns a string.
 2014-07-28 11:24:58 -04:00
Michael DeHaan
30e6a659ae Merge pull request #8171 from jbenden/osx-10.10 
Support for OS X 10.10 DP3.
 2014-07-28 11:08:53 -04:00
Michael DeHaan
20f65f2c79 Merge pull request #8262 from icoloma/patch-1 
Bugfix: bulletproof unexpected_error_msg at gce.py
 2014-07-28 11:03:54 -04:00
Veeti Paananen
a9eef029b6 Expand variables in configuration files 
e.g. $HOME. Fixes #6373.
 2014-07-28 17:36:14 +03:00
Nacho Coloma
979824eedc Moved import to the top 2014-07-28 08:36:56 +02:00
James Cammarata
6eac47e519 Use split_args instead of shlex.split for included params 
Fixes #8296
 2014-07-26 00:30:42 -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
57f89b85eb Merge pull request #8271 from tksmd/fix-copy-set-fs-attributes-issue 
fix an issue that copying directory will fail when trying to change file attributes
 2014-07-25 09:38:24 -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
James Cammarata
10a850c70f Merge branch 'new_arg_splitting' into devel 2014-07-24 21:27:25 -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
Michael DeHaan
b5d64fdb36 Some notes/comment upgrades on split_args. 2014-07-24 16:34:06 -04:00
James Cammarata
43154e5101 Using custom splitting function for module param counting 2014-07-24 14:42:35 -05:00
Michael DeHaan
e143d7dab7 Merge pull request #7543 from yangliping/fix_local_facts_file_checking_portability 
Fix portability issue when checking local facts file permission.
 2014-07-24 09:37:22 -04:00
Michael DeHaan
635bea645c Merge pull request #7992 from dehylton/devel 
fix swap translation on 4.x openbsd with 2.5.4 python
 2014-07-24 09:34:38 -04:00
James Cammarata
b21875d5a9 Make sure 'item' variable is set when using first_available_file 
Fixes #8220
 2014-07-24 00:05:26 -05:00
someda
1b1d5d0d3d fix an issue that copying directory will fail when trying to change file attributes and the target file already exists on remote 
- the issue was introduced by the commit 84759faa09
 2014-07-24 14:03:36 +09:00
James Cammarata
2cc602beea Fixes for module param counting and additional shell quoting issues 2014-07-23 22:54:59 -05:00
Benno Joy
ac85d8444b fix for unarchive 8257 2014-07-23 14:50:16 +00:00
Nacho Coloma
57428c48a2 Bugfix: bulletproof unexpected_error_msg at gce.py 
This method was still failing for me with a "missing http_code" message. After applying this change, the error message is:

```
msg: Unexpected response: {'value': 'PyCrypto library required for Service Account Authentication.'}
```

I wanted to contribute a rock-solid `unexpected_error_msg` implementation.
 2014-07-23 16:45:24 +02: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
00e089e503 Revert "Explicitly set the user option for ssh connections" 
This reverts commit 0f91add86f.

Fixes #8216
 2014-07-21 10:32:55 -05:00
Joseph Benden
da5e32b316 Needs additional divisor. 2014-07-18 07:55:24 -07:00
Michael DeHaan
0fad9575e9 Refine error message about invalid ops since people forget to indent tasks fairly often. 2014-07-17 10:13:10 -04: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
Joseph Benden
b55791ef43 Support for OS X 10.10 DP3. 2014-07-16 12:37:11 -07:00
James Cammarata
62e9cf63b7 Merge pull request #8170 from sergevanginderachter/issue_8159 
Load existing group_vars file for new group_by group
 2014-07-16 14:28:14 -05:00
Serge van Ginderachter
4e9a253bef Load existing group_vars file for new group_by group 
if it was not loaded yet, which happens if that group
didn't exist yet in the inventory.

fixes #8159
 2014-07-16 21:16:27 +02:00
James Cammarata
42b5294820 Merge branch 'devel' of https://github.com/leverich/ansible into leverich-devel 2014-07-16 14:02:13 -05:00
Felix Geyer
0ebd19e97b Fix regression: Sanitize sudo success_key from stdout 
Commit 7e3dd10 caused a regression with sanitizing the sudo success_key from stdout.
There is no newline in front of SUDO-SUCCESS when using sudo.
This change adapts the regex to make the line break optional.

Tested on Ubuntu 14.04.
 2014-07-16 18:14:35 +02:00
Ruggero Marchei
909955f2e2 fix get_distribution_version() on amazon linux 2014-07-15 18:04:46 +02: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
e74853300a Merge branch 'task-host-loop-bypass' of https://github.com/sivel/ansible into sivel-task-host-loop-bypass 2014-07-14 14:21:25 -05:00
James Cammarata
cdb9f13559 Merge pull request #7605 from sivel/delegate-callback-hint 
Show delegate_to hint in callback output
 2014-07-14 11:10:52 -05: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
Serge van Ginderachter
e8b45a9ef7 Invalidate host/group variables cache when loading 
extra varsiables based on playbook basedir.
 2014-07-14 15:21:33 +02:00
Serge van Ginderachter
d39ff55688 Fix logic bug when loading vars for a new playbook basedir. 2014-07-14 15:12:53 +02: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
4e5eb7559e Merge branch 'svg_and_inventory_refactor' into devel 2014-07-10 14:43:07 -05:00
Bjorn Neergaard
08f97c0b9d Fix hostname when get_distribution_version() returns a string. 
The distro version is a string ('jessie/sid') on Debian unstable and testing.
Because load_platform_subclass() evaluations every subclass as it loops,
comparing numbers when get_distribution_version() does not return a number will
break.

This patch fixes that by returning a number (`0`) when we have an invalid
version, instead of returning `None` or a string.
 2014-07-10 11:27:03 -07:00
Dan Slimmon
307a3e8a9c Fixed regex square-bracket bug. 
Regexes were being parsed like ordinary ansible host patterns, so
square-bracket groups were getting interpolated wrongly.
 2014-07-10 00:08:12 +00:00
James Cammarata
b8ac094eaa Tweak to only show msg on assert failure if set 2014-07-08 14:05:24 -05:00
James Cammarata
16332b8488 Merge branch 'assert-with-msg' of https://github.com/darkk/ansible into darkk-assert-with-msg 2014-07-08 13:56:08 -05:00
James Cammarata
aa261bdd14 Optimizing groups_for_host() lookup in inventory 2014-07-07 21:08:39 -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
James Cammarata
11a5fc85f4 Merge branch 'inventory_refactoring' into svg_and_inventory_refactor 2014-07-07 13:11:58 -05:00
James Cammarata
bcf83cbc24 Merge branch 'sergevanginderachter-inventorytree' into svg_and_inventory_refactor 2014-07-07 13:11:52 -05:00
Serge van Ginderachter
ff4119adc0 Performance optimization in resolving host patterns 
Avoid resolving a pattern that is a plain host. When matching a hostname in the
hosts_cache, just use the host object from there.

When running a task on say 750 hosts, this yields a huge improvement.
 2014-07-07 12:50:50 -05:00
Matt Martz
6591dd560d Show delegate_to hint in callbacks 2014-07-07 12:39:08 -05:00
Leonid Evdokimov
d94395f48c assert: add optional msg argument 
Sample playbook when it may be useful:
```
- uri: return_content=yes url={{ api_base }}/action/{{ inventory_hostname }}
  register: output
- assert:
    msg: '{{ output.json | to_nice_json }}'
    that:
      - output.json.foo != "bar"
      - output.json.boo == 42
```
 2014-07-07 19:05:17 +04:00
James Cammarata
7f8de3a265 Merge pull request #8024 from kcghost/7941 
removed port from domain name qualification, fixes #7941
 2014-07-04 23:15:17 -05:00
James Cammarata
ff04b2b532 Allow empty yaml vars files 
Fixes #7843
 2014-07-04 23:10:32 -05:00
Michael DeHaan
51e014d915 Merge pull request #8012 from cchurch/callback_cleanup 
Callback plugin cleanup
 2014-07-03 19:29:59 -05:00
Michael DeHaan
c2ac8fda1e Data from inventory scripts should be able to use nested Jinja2 expressions. 2014-07-03 16:11:14 -04:00
Henry Finucane
de64bbdc5f Support a whitelisted subset of jinja2 template options 2014-07-02 21:14:26 -07:00
Casey Fitzpatrick
7115cb1f37 removed port from domain name qualification, fixes 7941 2014-07-02 19:54:50 -04:00
Marc Abramowitz
5b783e0bc6 Error if private_key_file is group/world readable 
Currently, if you have this, ansible fails with a generic error and
suggests running again with `-vvvv`. This isn't bad but pinpointing the
specific problem immediately is even more user-friendly.

```
$ ls -l devops.pem
-rw-r--r--+ 1 marca  staff  1679 Jul  2 11:25 devops.pem

$ ansible -m ping --private-key=devops.pem mt3-pyweb01
mt3-pyweb01 | FAILED => private_key_file (devops.pem) is group-readable or world-readable and thus insecure - you will probably get an SSH failure
```
 2014-07-02 13:44:53 -07:00
James Cammarata
81f35323e9 Revert "Fix get_distribution() for platforms that may have spaces" 
This reverts commit 2493020d9f.
 2014-07-02 09:44:44 -05:00
Chris Church
955dadf743 Remove runner_on_error callback that is never used. 2014-07-01 17:02:10 -04:00
Chris Church
4e98e3785a Reset play attribute on callback plugins when a play fails. 2014-07-01 17:02:10 -04:00
Chris Church
30fae95efe Change variable from pattern to name to correctly indicate what is being passed to the callback. 2014-07-01 17:02:09 -04: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
dewey hylton
379e1a49cb fix swap translation on 4.x openbsd with 2.5.4 python 2014-06-30 17:23:55 -04:00
Michael Scherer
f0a7139290 Fix exec_command prototype for the plugin 2014-06-28 13:06:40 +02:00
mesk41in
488aec3936 Fix unsupported regexp parameter in assemble 2014-06-27 13:54:59 +04:00
James Cammarata
539426f612 Performance tuning inventory functions for large inventories 2014-06-26 23:15:39 -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
James Cammarata
d8a7b49b59 Merge branch 'inventorytree' of https://github.com/sergevanginderachter/ansible into sergevanginderachter-inventorytree 2014-06-24 15:21:08 -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
James Cammarata
1adb6dfa05 Remove redundant 'self.user or' added by 0f91add 2014-06-24 10:45:38 -05:00
Thomas Mangin
0f91add86f Explicitly set the user option for ssh connections 
Fixes #7170
 2014-06-23 15:57:49 -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
James Cammarata
5d65c1c4a4 Merge branch 'Mbosco-patch-1' into devel 2014-06-23 13:00:51 -05:00
James Cammarata
6bd0621037 Merge branch 'devel' of https://github.com/ansible/ansible into devel 2014-06-23 12:59:12 -05:00