James Cammarata
ee559e03f7
Merge pull request #12725 from mgedmin/py3k
...
Python 3: there's no basestring
2015-10-13 16:52:46 -04:00
Toshio Kuratomi
3f2efddeb2
Merge pull request #12733 from docschick/ansible_ssh_docswork
...
added "include" for ansible_ssh_ change to another section
2015-10-13 11:22:31 -07:00
Sandra Wills
7dfce28e9a
added "include" for ansible_ssh_ change note to another section of intro_inventory.rst for clarity
2015-10-13 13:59:44 -04:00
James Cammarata
e6d3c6745f
Revert to using local file/dir tests in inventory instead of loader's
...
Fixes #12719
2015-10-13 12:04:01 -04:00
Brian Coca
c637d60a8d
fixed deprecation message
2015-10-13 11:40:21 -04:00
Brian Coca
f5227d494b
added missing cachefile and changed str(e) to to_bytes(e)
2015-10-13 11:15:10 -04:00
Brian Coca
3a0bf55ae3
better error catching for doc build
2015-10-13 11:14:28 -04:00
James Cammarata
76c8318351
Merge pull request #12688 from docschick/ansible_ssh_docswork
...
Ansible ssh changes docswork
2015-10-13 07:59:49 -04:00
Marius Gedminas
9ba6c087d3
Python 3: there's no basestring
2015-10-13 09:56:12 +03:00
James Cammarata
3cae8a4394
Merge pull request #12724 from mgedmin/py3k
...
Python 3: there's no iteritems()
2015-10-13 02:49:49 -04:00
Marius Gedminas
f03da5be42
Python 3: there's no iteritems()
2015-10-13 09:47:16 +03:00
James Cammarata
2d77c643e4
Merge pull request #12723 from mgedmin/py3k
...
Make ansible.vars.unsafe_proxy Python 3 friendly
2015-10-13 02:45:55 -04:00
Marius Gedminas
e511d6d458
Make UnsafeProxy work on Python 3
...
Instead of str and unicode we have to deal with bytes and str.
2015-10-13 09:41:08 +03:00
Marius Gedminas
af6a316d9b
Remove unused import
...
Fixes ImportError: No module named '__builtin__' on Python 3.
2015-10-13 09:37:48 +03:00
James Cammarata
426187489f
Add variable for format parameter
2015-10-13 02:33:18 -04:00
Marius Gedminas
9802c006a2
Typo: TOKENV -> TOXENV
...
This is purely cosmetic: the logic worked correctly, since tox never saw
the TOKENV environment variable.
2015-10-13 09:17:57 +03:00
=
e141101314
integration tests for ansible modules core 2147
2015-10-13 06:34:18 +01:00
Toshio Kuratomi
8277747a04
Fix password lookup when password file exists and the password is not encrypted
2015-10-12 15:52:03 -07:00
James Cammarata
cd2cb178ae
Totally rework the way UnsafeProxy does things
2015-10-12 18:13:09 -04:00
Toshio Kuratomi
723dcba486
Merge pull request #12614 from ansible/py3-module_utils-log
...
AnsibleModules.log() fix for python3
2015-10-12 13:36:28 -07:00
Toshio Kuratomi
15d7f53846
AnsibleModules.log() fix for python3
...
Also add unittests for AnsibleModules.log()
Fixes #12586
2015-10-12 13:30:27 -07:00
Toshio Kuratomi
b49e0995cb
Fix typo
2015-10-12 13:29:04 -07:00
Toshio Kuratomi
b58d7470d4
Cleanup logic and be more paranoid about passwords with spaces
2015-10-12 12:55:33 -07:00
James Cammarata
5c5806d669
Fixing bugs related to jfonfile cache plugin
...
* corrupt/invalid file causes tracebacks
* incorrect initialization of display/_display in BaseCacheModule class
* tweaking the way errors in get() on jsonfile caches work, to raise
a proper AnsibleError in that situation so the playbook/task is stopped
Fixes #12708
2015-10-12 13:06:41 -04:00
Toshio Kuratomi
b441bcb678
Fix display when run through a testing framework that overrides stderr/stdout
2015-10-12 10:06:13 -07:00
James Cammarata
d15fcf05f0
Fix bug in the way temp vars were created for templating vars_files
...
Fixes #12711
2015-10-12 12:17:45 -04:00
Sandra Wills
32cb2fa215
removed repetition of note and replaced with an include directive
...
ansible_ssh_* changes from 1.9 to 2.0, original note made into a separate file
for easier editing, and an include for this new file added to each of the 6 file affected
by this change
2015-10-12 11:41:09 -04:00
Brian Coca
2c24fbbd6a
Merge pull request #12618 from AdThrive/devel
...
Added an option to use the private network IP address for DigitalOcean dynamic inventory
2015-10-12 11:35:43 -04:00
Brian Coca
f5f3bf06e4
Merge pull request #12550 from redrampage/remove-pw-salt-deletion
...
Removed deletion of salt by 'password' lookup
2015-10-12 11:33:19 -04:00
James Cammarata
73661d1761
Merge branch 'devel' of https://github.com/ansible/ansible into devel
2015-10-12 11:30:03 -04:00
James Cammarata
424b623c5d
Merge branch 'klshxsh-serial_should_be_string' into devel
2015-10-12 11:29:29 -04:00
James Cammarata
0e1a5919c8
Adding unit tests for PlaybookExecutor _get_serialized_batches
2015-10-12 11:27:37 -04:00
Charles Paul
3d533cb423
fixing calls to fail_json
2015-10-12 08:50:18 -05:00
Brian Coca
50372eecc9
Merge pull request #12455 from privateip/devel
...
added methods for retrieving vapp and vm
2015-10-12 09:37:47 -04:00
James Cammarata
82e76e42e5
Tweak to the way serial percentages are handled
2015-10-12 09:00:43 -04:00
James Cammarata
63e288354e
Fix bug in way omitted values were set
2015-10-12 09:00:27 -04:00
James Cammarata
4c85ae0712
Merge branch 'serial_should_be_string' of https://github.com/klshxsh/ansible into klshxsh-serial_should_be_string
2015-10-12 08:28:07 -04:00
Sandra Wills
748ff72b6b
fixed typo, depricated --> deprecated, in all 6 notes
2015-10-12 08:01:24 -04:00
klshxsh
ac00c9ced7
changed 'string' to 'percent' for _serial
...
Note that this allows both integers (e.g. 3) and percentages (e.g. "30%")
Also changed default back to 0 rather than '0'
2015-10-12 12:41:00 +01:00
Marius Gedminas
43a65c7de4
Revert "Can we even ask for Python 2.4 on Travis?"
...
Becaue we can't: https://travis-ci.org/mgedmin/ansible/jobs/84866458
This reverts commit e31e866e79
2015-10-12 09:30:37 +03:00
Marius Gedminas
e31e866e79
Can we even ask for Python 2.4 on Travis?
2015-10-12 09:29:34 +03:00
Marius Gedminas
29202454c6
Run Travis integration tests with the right Python version
2015-10-12 09:27:18 +03:00
James Cammarata
eb60ce1b6e
Merge pull request #12703 from keitwb/inventory_file_var
...
Adding the inventory_file var back
2015-10-11 16:04:34 -04:00
James Cammarata
71a1a3c903
Submodule pointer update
2015-10-10 22:31:54 -04:00
Ben Keith
1f82971283
Adding the inventory_file var back
2015-10-10 21:54:28 -04:00
Toshio Kuratomi
6292520c45
Merge pull request #12444 from knakayama/bugfix/update-docs
...
Update docs (playbooks_loops.rst, playbooks_filters.rst)
2015-10-09 20:09:53 -07:00
James Cammarata
297aaeac2d
Backporting version release stuff from stable-1.9
2015-10-09 22:39:59 -04:00
Toshio Kuratomi
d660381f98
Merge pull request #12450 from glnds/devel
...
Installation update for people using Fishshell
2015-10-09 19:39:30 -07:00
Toshio Kuratomi
45a161b0a1
Merge pull request #12429 from edmstudio/devel
...
Update synchronize module plugin to work on OS X
2015-10-09 16:05:46 -07:00
Petr Mifek
6e035a3e94
Move nested function test for ipv6 to top level in synchronize module.
2015-10-10 00:01:22 +02:00
