Commit graph

14183 commits

Author SHA1 Message Date
Rory Finnegan
3e25f633fe Applied some stashed fixes.
* Fixed file.close() typo in test_vault_editor
 * Updated unicode.py to redefine basestring properly in python3 and fixed a couple missed py27 specific code.
 * Realized the patch in test_data_loader was still failing cause we are passing the string 'builtins.open' and not actually using it in that file and soe instead of failing in py34 it would fail in py27.
2015-04-16 17:20:46 -04:00
Rory Finnegan
f3fed01a7e Attempted to updated the vault editor to support 2/3 compatibility.
Unfortunately, I wasn't able to fix a bug in the VaultAES in which during
the test_decrypt_1_0 and test_rekey_migration in which VaultAES wasn't successfully
writing the writing the encrypted key to out_file (BytesIO).

Added skipping vault_editor tests test_decrypt_1_0 and test_rekey_migration in python3
since I wasn't able to successfully backport VaultAES without weird bugs.
2015-04-16 16:01:21 -04:00
Rory Finnegan
43ab4c12dd Fixed NoneType import error which worked in python2, but not 3.
In mod_args we were checking `isinstance(thing, NoneType)` when
thing is None works the same since NoneType can't be subclassed in
python 2 or 3 and it removes the need for the NoneType import.
2015-04-16 16:01:21 -04:00
Rory Finnegan
176ae06cbd Updated the vault/__init__.py and test_vault.py files to support 2/3.
Existing tests pass under both versions, but there could still be some issues
since, it involves a lot of 2/3 bytes-unicode conversions.
2015-04-16 16:01:21 -04:00
Rory Finnegan
28443cf0a9 Updated parsing/vault/test_vault.py to use the fake byte literals in six when using hexlify.
This was to fix the `TypeError: 'str' does not support the buffer interface` errors.
2015-04-16 16:01:21 -04:00
Rory Finnegan
f8fe1357b0 Updated the utils/unicode.py file with 2/3 compatibility.
NOTES:
  1. replaced unicode, str, etc with their six counterparts
  2. isinstance(obj, basestring) -> isinstance(obj, (string_types, text_type))
  3. I'm not entirely confident about the behaviour of __str__ and __unicode__ between versions
     so that might require a bit more testing.
2015-04-16 16:01:21 -04:00
Rory Finnegan
1e139fe08f Updated the test_data_loader to use six.builtins vs __builtins__ 2015-04-16 16:01:21 -04:00
Rory Finnegan
77cd7a6e89 Fixed 2/3 compatibility issues in parsing/yaml/test_loader with six. 2015-04-16 16:01:20 -04:00
Rory Finnegan
7e9292c755 Updated parsing/yaml/objects.py with 2/3 compatibility. 2015-04-16 16:01:20 -04:00
Brian Coca
fa1eff8356 added new ec2_ami_find and deprecated ec2_ami_search 2015-04-16 15:42:55 -04:00
Toshio Kuratomi
3075a4db25 Merge pull request #10734 from ralphbean/devel
Remove check of hardcoded AWS region list.
2015-04-16 11:06:16 -07:00
Toshio Kuratomi
b9a3e969c7 Merge pull request #10750 from mscherer/fix_coreos_facts
Add CoreOS facts detection, fix https://github.com/ansible/ansible-modul...
2015-04-16 11:02:05 -07:00
Brian Coca
21a2a8bc94 Merge pull request #10744 from bcoca/v2_base_consolidation
made certain flags part of base to make them universally settable
2015-04-16 13:19:05 -04:00
Michael Scherer
b4f02625cd Add CoreOS facts detection, fix https://github.com/ansible/ansible-modules-core/issues/1000 2015-04-16 13:04:23 -04:00
Brian Coca
c4ede91b32 Merge pull request #10749 from phips/update_become_docs
Fixed a few typos in the become documentation
2015-04-16 12:32:17 -04:00
Mark Phillips
77afdd16b0 Fixed a few typos in the become documentation 2015-04-16 17:30:54 +01:00
Brian Coca
ec01e071d8 adjusted for the posibolity of lsblk not existing for fact gathering 2015-04-16 11:57:51 -04:00
Brian Coca
f478f1ec10 fixed vars in block now that they are a field atribute also 2015-04-16 11:13:21 -04:00
Brian Coca
2ad787038f removed vars from block as its now in base 2015-04-16 10:26:18 -04:00
Brian Coca
92c8275f94 made certain flags part of base to make them universally settable 2015-04-16 08:36:59 -04:00
Toshio Kuratomi
7e1644bffd Add smoketest unittests for the connection plugins 2015-04-15 16:33:57 -07:00
Toshio Kuratomi
01df51d2ae Improve the API for connection plugins and update local and ssh to use it 2015-04-15 16:32:44 -07:00
Toshio Kuratomi
1f7d23fc18 Fix call to skipUnless by adding a reason 2015-04-15 15:57:13 -07:00
Toshio Kuratomi
b4fa438927 Merge pull request #10737 from ansible/v2-optional-test-reqs
Make some of the optional requirements optional for testing -- we'll skip the tests instead
2015-04-15 15:38:21 -07:00
Toshio Kuratomi
0be531db71 Make some of the optional requirements optional for testing -- we'll skip the tests instead 2015-04-15 15:35:21 -07:00
Ralph Bean
4903bca0c1 Remove check of hardcoded AWS region list.
You can extend boto to point at other regions that are defined in a
private cloud by defining ``BOTO_ENDPOINTS`` or ``endpoints_path`` in
the ``~/.boto`` file.

Ansible was doing a premature check against a hard-coded list of regions
that interrupted this possibility.  This commit removes that and
clarifies what the user can do if they specify a non-AWS region.
2015-04-15 17:55:27 -04:00
Brian Coca
abb93d9115 Merge pull request #10732 from mscherer/prefer_dnf_to_yum
Prefer dnf to yum.
2015-04-15 16:27:19 -04:00
Michael Scherer
f624ec4cb8 Prefer dnf to yum.
On Fedora 22 and later, yum is deprecated and dnf is installed by
default. However, the detection do not seems to take this in account,
and always use yum, even when yum cli is just a wrapper to tell "use
dnf", as this is the case on F22 and later ( see package dnf-yum ).

As dnf is not installed by default, except on F22, this shouldn't
break anything.
2015-04-15 16:11:08 -04:00
Brian Coca
309bbda5c4 Merge pull request #10574 from joefis/patch-1
Vagrant inventory: exit 0 on success
2015-04-15 15:33:16 -04:00
Toshio Kuratomi
055d14449b Merge pull request #10729 from mchlumsky/plugins_cache_abc
Use abc for BaseCacheModule
2015-04-15 11:34:35 -07:00
Martin Chlumsky
45247eb4b3 Use abc for BaseCacheModule 2015-04-15 13:09:59 -04:00
Toshio Kuratomi
a0def30c34 Add integration test for unarchive filelist feature 2015-04-15 09:28:50 -07:00
Toshio Kuratomi
7462e7e110 Merge pull request #10718 from mscherer/remove_deadcode
Remove old dead code ( variable no longer exist, not used )
2015-04-15 09:19:30 -07:00
Toshio Kuratomi
baad0a62f9 Merge pull request #10723 from mscherer/fix_errors_playbook
Fix errors reporting for playbook/*
2015-04-15 09:16:30 -07:00
Toshio Kuratomi
3f03f76f97 Merge pull request #10722 from mscherer/fix_wrong_exception
Do add a unused named argument using a variable that was removed
2015-04-15 09:15:56 -07:00
Toshio Kuratomi
1afd24ae9f Merge pull request #10721 from mscherer/fix_role_metadata
Fix serialize function by using the right members name
2015-04-15 09:15:05 -07:00
Toshio Kuratomi
1aff837ab8 Merge pull request #10720 from mscherer/fix_roles_requirements
Fix variable name
2015-04-15 09:14:15 -07:00
Brian Coca
a6592ba0f9 updated banners as per marketing's request 2015-04-15 11:49:46 -04:00
Toshio Kuratomi
791dbd7661 Update extras module ref on v2 2015-04-15 05:15:30 -07:00
Toshio Kuratomi
aab681bc2b Update core and extras module refs and add tests for an unarchive
problem that the update fixes:

https://github.com/ansible/ansible-modules-core/issues/1064
2015-04-15 05:14:20 -07:00
James Cammarata
02e7385002 Filter tasks based on tags during iterator setup in v2 2015-04-15 01:17:02 -05:00
James Cammarata
96a7d85b61 Adding more magic variables for connection info to v2 2015-04-15 01:17:02 -05:00
Michael Scherer
b20d54520c Fix errors reporting for playbook/* 2015-04-15 01:06:02 -04:00
Michael Scherer
b43ede1eb4 Do add a unused named argument using a variable that was removed
Found by pylint.
2015-04-15 01:03:31 -04:00
Michael Scherer
72cf11f8e1 Fix serialize function by using the right members name 2015-04-15 00:59:39 -04:00
Michael Scherer
5aa56245d5 Fix variable name
There is no 'role' variable, and given the test and code after, that's
likely a test on 'ds'
2015-04-15 00:58:11 -04:00
Toshio Kuratomi
460dc5e4db Fix errors import 2015-04-14 19:56:17 -07:00
Toshio Kuratomi
719d01067e Use six to assign metaclass for py2 and py3 compat 2015-04-14 19:43:23 -07:00
Toshio Kuratomi
c0f6712a37 Merge pull request #10719 from mscherer/fix_error_action_v2
Fix the filename in error message (pylint)
2015-04-14 19:22:19 -07:00
Toshio Kuratomi
61379a609b Merge pull request #10717 from mscherer/fix_connexion_info
Fix various pylint issues ( missing import and wrong variable names )
2015-04-14 19:19:23 -07:00