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
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
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
Martin Chlumsky
45247eb4b3
Use abc for BaseCacheModule
2015-04-15 13:09:59 -04: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
Toshio Kuratomi
791dbd7661
Update extras module ref on v2
2015-04-15 05:15:30 -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
James Cammarata
9097274fe0
Fixing minimal callback for v2 to use the new api
2015-04-14 21:11:12 -05:00
James Cammarata
dd1c14a0c7
Adding a method for setting up magic variables from connection info in v2
2015-04-14 21:11:12 -05:00
Toshio Kuratomi
0fb4520d7a
Merge pull request #10716 from mscherer/fix_export
...
Fix the name of the exported class ( pylint )
2015-04-14 18:59:38 -07:00
Michael Scherer
2d9097e025
Fix the filename in error message (pylint)
2015-04-14 19:13:27 -04:00
Michael Scherer
6dcc883ac9
Remove old dead code ( variable no longer exist, not used )
2015-04-14 19:07:57 -04:00
Michael Scherer
1acd56a9aa
Fix various pylint issues ( missing import and wrong variable names )
2015-04-14 19:04:08 -04:00
Michael Scherer
07c3107cfe
Fix the name of the exported class ( pylint )
2015-04-14 19:03:18 -04:00
Toshio Kuratomi
b4437ebd9a
Merge pull request #10713 from mscherer/fix_shell_plugin_import_v2
...
Rename the import, since the directory was renamed for v2
2015-04-14 15:17:55 -07:00
Toshio Kuratomi
8134ffeb1f
Merge pull request #10712 from mscherer/fix_v2_sh_plugin
...
Add missing imports. They are used later in mkdtmp, needed by action plu...
2015-04-14 15:17:19 -07:00
Michael Scherer
570f9db6bf
Add/correct missing imports for AnsibleError in v2 lookup plugins
2015-04-14 17:42:57 -04:00
Michael Scherer
674d1e72f6
Rename the import, since the directory was renamed for v2
2015-04-14 17:05:02 -04:00
Toshio Kuratomi
f25f2d9626
Merge pull request #10711 from mscherer/fix_wrong_name_parsererror
...
Fix the exception name ( AnsibleParserError, not AnsibleParsingError )
2015-04-14 13:57:05 -07:00
Michael Scherer
c0c115317a
Add missing imports. They are used later in mkdtmp, needed by action plugins
2015-04-14 16:56:35 -04:00
Toshio Kuratomi
12bd0e7a6b
Merge pull request #10709 from mscherer/fix_missing_builtin
...
Add a import for 'builtins' module, used in CleansingNodeVisitor.
2015-04-14 13:55:10 -07:00
Michael Scherer
0c74b356d2
Add a import for 'builtins' module, used in CleansingNodeVisitor.
...
This was previously done by ./lib/ansible/utils/__init__.py, but
this code is no longer here in v2 anymore. And since the module
got renamed in python3 to builtins ( https://docs.python.org/3/library/builtins.html ),
we have to use six.
2015-04-14 16:47:58 -04:00
Toshio Kuratomi
37b4b68e83
Use six.moves to find configparser instead of our compat code
2015-04-14 13:40:50 -07:00
root
996bd05823
Revert "Rather than moving connection option setting, fix defaults"
...
This reverts commit 0345b675f8
.
2015-04-14 13:40:50 -07:00
Michael Scherer
1566a90fcd
Fix the exception name ( AnsibleParserError, not AnsibleParsingError )
2015-04-14 16:36:39 -04:00
Brian Coca
53177a9bd9
Merge pull request #10708 from mscherer/fix_hashing_error
...
Missing import for ansible.errors (pylint)
2015-04-14 16:15:16 -04:00
Michael Scherer
65f6f76323
Missing import for ansible.errors (pylint)
2015-04-14 16:13:33 -04:00
Toshio Kuratomi
76eef1a48f
Merge pull request #10704 from mscherer/fix_wrong_var_v2
...
Do not import all ansible errors and fix the exception raised
2015-04-14 13:12:20 -07:00
Brian Coca
566399422f
Merge pull request #10707 from mscherer/fix_deprecation_warning
...
Pylint warning, the method _warning is called warning
2015-04-14 16:11:56 -04:00
Brian Coca
cec42eac47
Merge pull request #10706 from mscherer/fix_deprecate_v2
...
Pylint show a error "no deprecations variable"
2015-04-14 16:11:24 -04:00
Michael Scherer
de57459dd4
Pylint warning, the method _warning is called warning
2015-04-14 16:10:19 -04:00
Michael Scherer
f641b91594
Pylint show a error "no deprecations variable"
2015-04-14 16:03:54 -04:00
Michael Scherer
28f51233c8
Add another error, who seems to be all over the place
2015-04-14 15:50:31 -04:00
Michael Scherer
6957d66a26
Do not import all ansible errors and fix the exception raised
2015-04-14 15:43:02 -04:00
Michael Scherer
8592ffb573
Add back AnsibleFileNotFound ( used in connection plugins )
2015-04-14 15:23:59 -04:00
James Cammarata
0345b675f8
Rather than moving connection option setting, fix defaults
...
This reverts the previous commit (d71834d
) and instead fixes the problem
by making sure that options used by ConnectionInformation do not have
defaults set in the playbook objects so they're properly inherited from
the CLI options object if not otherwise specified in the play
2015-04-14 12:06:19 -05:00
James Cammarata
d71834d1d2
Moving setting of options values to after play again
...
Moving this above the play setting means that any default values set
in play (like connection) override any corresponding CLI option, which
is wrong. Generally CLI options should override things set in playbooks
2015-04-14 10:56:10 -05:00
Toshio Kuratomi
c14f072a3b
Merge pull request #10693 from momandine/import_fixes
...
Import fixes
2015-04-13 14:39:01 -07:00
Amandine Lee
164cfdfda4
Fix typo
2015-04-13 14:28:00 -07:00
Toshio Kuratomi
c486b6773a
Merge pull request #10692 from ianzd/python3
...
Import queue from six.moves for python3 compatibility.
2015-04-13 14:26:40 -07:00
Amandine Lee
08feaea077
Fix plugin imports with six
2015-04-13 14:04:31 -07:00
Ian Dotson
6e12117b04
Import queue from six.moves for python3 compatibility.
2015-04-13 17:01:00 -04:00
Toshio Kuratomi
4b889bbe3d
Add six to the v2 test-requirements
2015-04-13 13:43:25 -07:00
Toshio Kuratomi
056f646bda
Merge pull request #10681 from dorianpula/test_requirements_for_v2
...
Add test requirements for working with v2.
2015-04-13 13:42:23 -07:00
Toshio Kuratomi
7133d6361f
Merge pull request #10691 from ianzd/python3
...
Change how we're calling StringIO
2015-04-13 13:36:22 -07:00
Toshio Kuratomi
5dce745868
Merge pull request #10690 from momandine/print_function
...
Print function
2015-04-13 13:35:04 -07:00
Ian Dotson
d85f97ccfd
Change how we're calling StringIO since we're now importing the class rather than a module.
2015-04-13 16:31:16 -04:00
Amandine Lee
683c2913c5
Use print function
2015-04-13 13:28:27 -07:00
Amandine Lee
3d2a056ad4
Import futures including print
2015-04-13 13:28:01 -07:00
Toshio Kuratomi
b0479c425b
Merge pull request #10688 from ianzd/devel
...
Import StringIO from six in a couple more places.
2015-04-13 13:05:36 -07:00
ian
3bb7b0eef3
Import StringIO from six in a couple more places.
2015-04-13 16:03:02 -04:00
Toshio Kuratomi
3a8088fe30
_available_vars in v1 == _available_variables in v2
2015-04-13 12:58:21 -07:00
ian
1bdf0bb0d6
Several more changes to suport python3 syntax.
2015-04-13 15:37:25 -04:00
Dorian Pula
3504f1cad9
Add test requirements for working with v2.
2015-04-13 13:44:58 -04:00