Commit graph

13967 commits

Author SHA1 Message Date
Toshio Kuratomi
67e59c5429 Merge pull request #10715 from mscherer/fix_import_errors_lookup_plugin
Add/correct missing imports for AnsibleError in v2 lookup plugins
2015-04-14 15:16:10 -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
2319328f14 Merge pull request #10710 from invenia/devel
Updated the tox.ini file to run multiple ansible versions.
2015-04-14 13:56:31 -07: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
Rory Finnegan
131ce117a9 Updated the tox.ini file to run multiple ansible versions.
Purpose: so that devs can use tox to run v1 or v2 of ansible with various versions of python.
For example `tox -e py27-v2 will run python2.7 on v2. Currently, only py26 and py27 are run on v1 when
running just `tox` so that we aren't breaking builds.
2015-04-14 16:30:52 -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
Brian Coca
79e8e26412 Merge pull request #10705 from mscherer/add_another_missing_error
Add another error, who seems to be all over the place
2015-04-14 16:02:40 -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
Toshio Kuratomi
b69f57d8a4 Merge pull request #10703 from mscherer/fix_missing_errors_v2
Add back AnsibleFileNotFound ( used in connection plugins )
2015-04-14 12:40:35 -07:00
James Cammarata
46beaf8a47 Submodule update 2015-04-14 14:38:56 -05:00
Michael Scherer
8592ffb573 Add back AnsibleFileNotFound ( used in connection plugins ) 2015-04-14 15:23:59 -04:00
Brian Coca
8d871f9650 Merge pull request #7444 from carsongee/cg/nova_inventory_improvements
Improvements to OpenStack inventory script
2015-04-14 14:59:41 -04:00
Brian Coca
09efba2a7c fixed indent when looking at delegate_to vars 2015-04-14 14:41:31 -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
Brian Coca
d5a7cd0efc bad hack to maybe fix some corner cases with pbrun custom prompts 2015-04-14 12:44:28 -04: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
ed601f964d Merge pull request #10683 from timsutton/remove-old-git-integration-test
Git integration test: remove test for ambiguous .git/branches dir
2015-04-13 15:14:32 -07: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
Amandine Lee
bd4c30b807 Merge remote-tracking branch 'upstream/devel' into devel 2015-04-13 13:40:44 -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
Toshio Kuratomi
4bbca9211a Merge pull request #10687 from ianzd/devel
Several more changes to support python3 syntax.
2015-04-13 12:42:57 -07:00
Brian Coca
483c8d338f Merge pull request #10684 from eroldan/patch-1
Fixed wrong example of 'environment' for setting PATH
2015-04-13 15:38:52 -04:00
ian
1bdf0bb0d6 Several more changes to suport python3 syntax. 2015-04-13 15:37:25 -04:00