Commit graph

409 commits

Author SHA1 Message Date
Toshio Kuratomi
223c2a2721 Update submodules 2015-04-28 10:44:43 -07:00
Toshio Kuratomi
50da8812d6 Fix up connection plugin test for new_stdin parameter 2015-04-28 10:39:30 -07:00
Toshio Kuratomi
bf003d31e0 Not a full port to v2's api, just a few fixups 2015-04-28 10:39:30 -07:00
Brian Coca
6a8062baad accidentally 'fixes' ubuntu distribution parsing, this order should not matter, need followup to figure out why this is the case 2015-04-28 10:16:14 -04:00
James Cammarata
3879550e74 Finish backporting of smart transport selection from v1 into v2 2015-04-27 14:43:25 -05:00
James Cammarata
6eba0d173d Revert shebang change added in v2 bin/ scripts 2015-04-27 13:57:26 -05:00
Matt Martz
29201c0dea Applying 499081490 fix for rax.py to v2 2015-04-27 11:59:11 -05:00
Matt Martz
313d01736a Applying cfd05ceaf fix for rax.py to v2 2015-04-27 11:57:36 -05:00
root
93cc08e613 Applying bf916fb5 fix to v2 2015-04-27 11:55:14 -05:00
James Cammarata
805e83d209 Updating module_utils/facts.py in v2 with v1 version 2015-04-27 11:50:51 -05:00
James Cammarata
8d174e7044 Updating module_utils/ec2.py in v2 with version from v1 2015-04-27 11:37:49 -05:00
James Cammarata
49bf70ed94 Moving new module_utils/cloudstack.py to v2 2015-04-27 11:31:17 -05:00
Brian Coca
55cf641b4b Applying backup_local fixes to v2 2015-04-27 11:31:17 -05:00
Toshio Kuratomi
582259f98b Applying c9fb97cc8 (permissions on symlink fix) to v2 2015-04-27 11:31:17 -05:00
Toshio Kuratomi
5034a2c702 Use six to import urlparse 2015-04-27 08:50:04 -07:00
Toshio Kuratomi
ed2e6fc8fa Restore python3 fixups 2015-04-27 08:46:26 -07:00
Toshio Kuratomi
8007829228 Enable warnings for python3 on scripts shebangs. 2015-04-27 08:34:16 -07:00
Toshio Kuratomi
af2dff9cfb Restore the python3-compat import __future__ and Exception as update. 2015-04-27 08:33:29 -07:00
James Cammarata
3aede800c5 Fixing winrm connection for v2 2015-04-27 00:28:43 -05:00
James Cammarata
8574d40b98 Initial work to make paramiko connections work under v2 2015-04-24 02:47:56 -04:00
James Cammarata
8c08f1b302 Updating connection plugins not yet updated in v2 to catch new code 2015-04-23 18:54:48 -05:00
James Cammarata
716a87ff36 Merge pull request #10142 from bcoca/v2_retry_files_config
v2 added retry configs, pending is actual functionality to make it conditional
2015-04-23 11:45:48 -05:00
James Cammarata
7669a0b275 Fixing some v2 bugs 2015-04-21 12:02:40 -05:00
Brian Coca
d996a2c216 ported fix from v1 to v2 on oracle linux family detection 2015-04-21 11:48:43 -04:00
James Cammarata
c58aaf72fc Properly handle lack of stdout in results in v2
Fixes #10549
2015-04-21 09:48:56 -05:00
Pahaz Blinov
bc47fe6f82 Python 3 compatible except statment 2015-04-21 19:13:11 +05:00
Brian Coca
d22898f702 changed vaulteditor import to new path, now vault seems to work 2015-04-20 13:42:24 -04:00
James Cammarata
d600c65095 Fix fetch action plugin in v2 to use the inventory_hostname in the dest dir
Fixes #10736
2015-04-20 11:16:35 -05:00
Brian Coca
cef93db0a7 Merge pull request #10754 from invenia/devel
Python 2/3 compatibility fixes to parsing in v2.
2015-04-20 11:00:35 -04:00
Brian Coca
1046a396ae fixed typo 2015-04-19 23:34:07 -04:00
Brian Coca
6d68d66d3c 1st draft port to v2 2015-04-19 23:32:07 -04:00
Brian Coca
d590dc35e7 Merge pull request #10769 from mscherer/add_requires_v2
Add a requires on python-six 1.4.0 ( for add_metaclass )
2015-04-19 01:17:48 -04:00
Brian Coca
7dd0858cb7 Merge pull request #10770 from mscherer/fix_ssh_connection_v2
Fix C.ANSIBLE_SSH_CONTROL_PATH string interpolation
2015-04-19 01:17:15 -04:00
Michael Scherer
cd25e0fba0 Fix C.ANSIBLE_SSH_CONTROL_PATH string interpolation
Since C.ANSIBLE_SSH_CONTROL_PATH use the old format
( "%{directory}" ), we need to use the % operator
and not the format method, at least for python 2.
2015-04-19 00:06:50 -04:00
Michael Scherer
873fd7db56 Add a requires on python-six 1.4.0 ( for add_metaclass )
This also mean that this doesn't run on RHEL 7 as of today.
2015-04-18 23:13:32 -04:00
Michael Scherer
2a6a01e122 Port some changes that occured on v1 get_facts modules to v2
- 5c64956a7 Set distribution, release, and version for NetBSD
- ec01e071d adjusted for the possibility of lsblk not existing
  for fact gathering
- d4eddabb2 Patch for bug #10485 - ansible_distribution fact
  populates as 'RedHat' on Oracle Linux systems
- 7813ffd71 Adding uptime_seconds fact for linux and darwin platforms
- 29cca0191 Adding oVirt recognition for oVirt guests.
- d0197195e Handle /etc/os-release files with 'Raspbian' in them
- 58a5f8dfa Pulls machine id in ansible facts
- 1968f9969 Wrong OS_FAMILY declaration for openSUSE
- 5dec45e24 Fix wrong distribution facts on SLES/openSUSE

and a few others
2015-04-18 22:46:36 -04:00
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
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
f478f1ec10 fixed vars in block now that they are a field atribute also 2015-04-16 11:13:21 -04:00