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