Commit graph

16627 commits

Author SHA1 Message Date
Toshio Kuratomi
baa309309d Bundle a new version of python-six for compatibility along with some code to make it easy for distributions to override the bunndled copy if they have a new enough version. 2015-10-16 08:21:28 -07:00
Toshio Kuratomi
28c933ce5e properly fail_json when we don't have ssl on a non-redhat distro 2015-10-16 08:06:32 -07:00
Toshio Kuratomi
4b4168bc92 Merge pull request #12781 from mgedmin/py3k
Python 3: print function in a shell oneliner in Makefile
2015-10-16 07:46:33 -07:00
Marius Gedminas
04a7ef416e Python 3: print function in a shell oneliner in Makefile
Fixes

    File "<string>", line 1
      import string,random; print 'ansible-testing-' + ''.join(random.choice(string.ascii_letters + string.digits) for _ in xrange(8));
                                                   ^
  SyntaxError: invalid syntax

when running integration tests with

  . hacking/env-setup
  . .tox/py35/bin/activate
  make -C test/integration test_var_precedence
2015-10-16 17:41:01 +03:00
Toshio Kuratomi
38b99a7a4d Merge pull request #12780 from mgedmin/py3k
Python 3: avoid %-formatting of byte strings
2015-10-16 07:40:10 -07:00
Marius Gedminas
98958ec990 Simplify join expression 2015-10-16 17:39:27 +03:00
Marius Gedminas
bd83410bdb Enable unit tests on Python 3.4 in tox and Travis
These now pass \o/
2015-10-16 17:19:26 +03:00
Marius Gedminas
56184a3d8c Python 3: avoid %-formatting of byte strings
This is needed for Python 3.4 compatibility; Python 3.5 can use
`b'%s\n' bytestring` again.
2015-10-16 17:18:35 +03:00
Toshio Kuratomi
89b0c3f6c4 Merge pull request #12775 from mgedmin/py3k
Python 3: fix vault tests
2015-10-15 23:44:01 -07:00
Marius Gedminas
a412b27604 Enable unit tests on Python 3.5
This enables the tests in tox and in Travis.  This ought to prevent
regressions in Python 3 support.

Note that Python 3.4 isn't supported (yet) because the vault code relies on
%-formatting of byte strings, a feature that was ripped out of Python 3.0
and restored in 3.5.

Also note that passing tests don't mean that Ansible itself can already
be used with Python 3.5: test coverage is only 53%.
2015-10-16 09:14:36 +03:00
Marius Gedminas
ec3ada1cda Fix test on Python 3: vault code expects bytes
(All tests now succeed on Python 3.5)
2015-10-16 09:13:46 +03:00
Marius Gedminas
5c70f932bd Fix test on Python 3: vault code expects bytes
(Third failing test out of four.)
2015-10-16 09:12:49 +03:00
Marius Gedminas
a1d95536f9 Fix test on Python 3: vault code expects bytes
(Different test than the last commit.)
2015-10-16 09:11:34 +03:00
Marius Gedminas
f58f0c62e1 Fix test on Python 3: vault code expects bytes 2015-10-16 09:10:25 +03:00
James Cammarata
174ecb843c Merge pull request #12770 from aslant/devel
Fix typo: comma not colon separates groups in patterns
2015-10-15 23:55:43 -04:00
Nick Cartwright
17469d0781 Fix typo: comma not colon separates groups in patterns 2015-10-16 04:30:46 +01:00
Brian Coca
4b60c2ec3b added taiga_issue to changelog 2015-10-15 19:47:53 -04:00
Sandra Wills
b1dfa94623 Merge pull request #12767 from ryansb/raw_install_python2
Document using the `raw` module to install a py2.X and simplejson
2015-10-15 15:16:20 -04:00
Ryan S. Brown
48e1396496 Add -y to yum command, otherwise it would hang indefinitely 2015-10-15 13:55:53 -04:00
Ryan S. Brown
9dcde77e0e Document using the raw module to install a py2.X and simplejson
In the installation guide, the raw module is mentioned as an option for
installing Python or simplejson on managed nodes that don't have them.
This change adds an example for users that may already be familiar with
using ansible but are checking install docs because they don't know the
requirements for managed nodes, or are using a distribution that doesn't
include Python 2 by default.
2015-10-15 13:35:07 -04:00
Brian Coca
aee6de5a76 group_names should not include implied 'all', fixes #12763 2015-10-15 11:46:43 -04:00
Brian Coca
68121b7990 added iptables to changelog 2015-10-15 11:00:01 -04:00
Brian Coca
66c02c119a added os_subnets_facts to changelog 2015-10-15 11:00:01 -04:00
Brian Coca
31c3f59704 added os_port to changelog 2015-10-15 11:00:01 -04:00
Brian Coca
40677ca4d2 added win_acl to changelog 2015-10-15 11:00:01 -04:00
James Cammarata
dce58a78c9 Make random cowsay truly random
Also adds a cowsay whitelist config option, because there are some
truly NSFW stencils that come with cowsay by default.
2015-10-15 10:52:53 -04:00
Sandra Wills
ce0cedc4a7 Merge pull request #12764 from docschick/docschick-fixes
vault and variables best practices info added, edited, and referenced
2015-10-15 10:01:06 -04:00
Sandra Wills
8501a46baa vault and variables best practices info added, edited, and referenced
This work fulfills PR #11799. Moved the content out of the vault file,
into best practices, edited it, then referenced it from variables and
vaults content files.
2015-10-15 09:55:17 -04:00
James Cammarata
fed7cea795 Merge pull request #12758 from mgedmin/fix-os-import
Fix Unexpected Exception: global name 'os' is not defined
2015-10-15 07:51:23 -04:00
Marius Gedminas
4fb6f62f1b Fix Unexpected Exception: global name 'os' is not defined
I inadvertently introduced it in
ca826508d9 and didn't notice, because
there are no unit tests for playbook_executor.py.  Sorry!

(The "from ansible.errors import *" was used *only* to get the 'os'
module, which makes go "what?")
2015-10-15 10:41:00 +03:00
Toshio Kuratomi
0526b43b5f Merge pull request #12757 from mgedmin/py3k
Python 3: fix AnsibleError formatting
2015-10-15 00:29:36 -07:00
Marius Gedminas
ab569cea22 Move to_str alias into ansible.utils.unicode
@abadger suggested on IRC that it's useful enough to go into
ansible.utils.unicode.
2015-10-15 10:27:38 +03:00
Toshio Kuratomi
d0ecceeacb Merge pull request #12707 from mgedmin/travis
Run Travis integration tests with the right Python version
2015-10-15 00:15:42 -07:00
Marius Gedminas
ca826508d9 Python 3: fix AnsibleError formatting
If you convert the error string to bytes and embed it inside another
error string, you get

  Prefix:

  b'Embedded\nerror\nstring'

which is not what we want.

But we also don't want Unicode in error messages causing unexpected
UnicodeEncodeErrors when on Python 2.

So let's convert the error message into the native string type (bytes on
Python 2, unicode on Python 3).
2015-10-15 09:38:14 +03:00
Toshio Kuratomi
5617f6aad4 Update synchronize to use the correct host when delegating
Fixes #12752
2015-10-14 18:57:10 -07:00
Toshio Kuratomi
85abd61001 Add some more info to docstring 2015-10-14 18:57:10 -07:00
James Cammarata
d923d05a33 Reworking the way all() works in plugin_loader
* Don't throw away the full path of the module code being loaded,
  as this can cause conflicts when files of the same name are being
  instantiated
* Generalize the module loading code

Fixes #12738
2015-10-14 17:53:28 -04:00
James Cammarata
45b803efb4 Properly use test_loader from SharedPluginLoaderObj 2015-10-14 17:53:28 -04:00
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