Chris Church
cb9f350c8f
Merge pull request #12720 from jhawkesworth/test_amc_2147
...
integration tests for ansible modules core 2147
2015-10-14 15:35:21 -04:00
Toshio Kuratomi
8c29910587
Merge pull request #12751 from jdelaporte/patch-1
...
Fix links to dynamic inventory script example.
2015-10-14 10:18:31 -07:00
jdelaporte
c2a5381438
Fix links to dynamic inventory script example.
...
:doc`aws_example` no longer existed.
2015-10-14 12:17:05 -05:00
Toshio Kuratomi
bafcd7becd
Merge pull request #12747 from docschick/docschick-fixes
...
reordering entries in glossary for alphabetical order
2015-10-14 09:08:32 -07:00
Toshio Kuratomi
c8ad55103e
Update extras modules ref to fix docs
2015-10-14 08:44:37 -07:00
Sandra Wills
1918604e72
reordering entries in glossary for alphabetical order
2015-10-14 11:37:27 -04:00
Toshio Kuratomi
faca6e9dfe
Add dnf rewrite to changelog
2015-10-14 08:12:31 -07:00
Toshio Kuratomi
e00eeba9c3
Update submodule refs
2015-10-14 08:06:55 -07:00
James Cammarata
91b0b4d40c
Check is_directory() before not is_file() in inventory basedir
...
Fixes #12742
2015-10-14 11:03:10 -04:00
Brian Coca
c57200925f
made syslog import optional as intel's edison custom compiles python w/o it
2015-10-14 09:12:02 -04:00
Toshio Kuratomi
2963bba901
Merge pull request #12740 from mgedmin/py3k
...
Python 3: don't convert module arguments to bytes
2015-10-14 00:36:19 -07:00
Marius Gedminas
225fe85530
Skip test_module_utils_basic_ansible_module_creation on Python 3
...
This reverts commit 073f10a52a
and instead
disables the failing test.
We're focusing on Python 3 support on the controller first; modules will
come later.
2015-10-14 09:32:26 +03:00
Marius Gedminas
073f10a52a
Python 3: don't convert module arguments to bytes
...
Fixes a test failure:
======================================================================
ERROR: test_module_utils_basic_ansible_module_creation (units.module_utils.test_basic.TestModuleUtilsBasic)
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/mg/src/ansible/test/units/module_utils/test_basic.py", line 250, in test_module_utils_basic_ansible_module_creation
supports_check_mode=True,
File "/home/mg/src/ansible/lib/ansible/module_utils/basic.py", line 470, in __init__
self._check_required_arguments()
File "/home/mg/src/ansible/lib/ansible/module_utils/basic.py", line 1050, in _check_required_arguments
self.fail_json(msg="missing required arguments: %s" % ",".join(missing))
File "/home/mg/src/ansible/lib/ansible/module_utils/basic.py", line 1445, in fail_json
sys.exit(1)
SystemExit: 1
-------------------- >> begin captured stdout << ---------------------
{"msg": "missing required arguments: foo", "failed": true}
because converting 'foo' to bytes yields b'foo' on Python 3, which
doesn't match the native-unicode 'foo' argument spec.
2015-10-14 08:43:26 +03:00
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