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