Commit graph

418 commits

Author SHA1 Message Date
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
Toshio Kuratomi
a444a7f363 Merge pull request #10680 from ianzd/devel
Change exceptions to python3 syntax.
2015-04-13 09:43:02 -07:00
Dorian Pula
b407dd8b58 Add setup.py for v2 to allow for pip editable installs. 2015-04-13 13:34:48 -04:00
ian
6747f82547 Change exceptions to python3 syntax. 2015-04-13 12:35:20 -04:00
Dorian Pula
b193d327b6 Fix re import failure in templates module when running unit tests. 2015-04-13 12:17:07 -04:00
Feanil Patel
0abcebf1e4 Don't convert numbers and booleans to strings.
Before this change if a variable was of type int or bool and the variable was referenced
by another variable, the type would change to string.

eg. defaults/main.yml
```
PORT: 4567
OTHER_CONFIG:
  secret1: "so_secret"
  secret2: "even_more_secret"

CONFIG:
  hostname: "some_hostname"
  port: "{{ PORT }}"
  secrets: "{{ OTHER_CONFIG }}"
```

If you output `CONFIG` to json or yaml, the port would get represented in the output as a
string instead of as a number, but secrets would get represented as a dictionary.  This is
a mis-match in behaviour where some "types" are retained and others are not.  This change
should fix the issue.

Update template test to also test var retainment.

Make the template changes in v2.
Update to only short-circuit for booleans and numbers.

Added an entry to the changelog.
2015-04-11 12:03:42 -04:00
Toshio Kuratomi
2af6314f57 Comment to clarify why we add one to the line and column recording 2015-04-10 04:09:50 -07:00
Brian Coca
3c9890a358 now in v2 everything passes a single passwords hash 2015-04-08 03:17:32 -04:00
James Cammarata
7076298dc1 Adding FIXME note to playbook executor code regarding password params 2015-04-06 22:27:14 -05:00
Brian Coca
d732c94ac2 a bunch of updates to connection info and related, to pass down passwords
also now options populate required fields in required order allowing play to override
added capture of debug in action plugins when stdout is not json
2015-04-06 22:35:02 -04:00
James Cammarata
e82ba723e2 Fixing multiple v2 bugs 2015-04-05 01:07:47 -05:00
Brian Coca
4bc79a746a more fine tunnign on verbosity 2015-04-04 16:26:05 -04:00
Brian Coca
b1e6aaa790 implemented verbosity, added 5th level and now can see how many plays per playbooko if -vvvvv 2015-04-04 15:54:54 -04:00
Brian Coca
5531b84360 moved ad-hoc to use display 2015-04-04 15:21:42 -04:00
Brian Coca
af97e732a0 updated ansible-playbook to use display, fixed issues breaking display class 2015-04-04 15:14:40 -04:00
Brian Coca
e6e69c0894 finished implementing list-hosts, started adding list-tasks/list-tags
but getting just task names and have to adjust for having blocks.
2015-04-04 10:25:55 -04:00
Brian Coca
2eb2a41d05 renamed get_entries to get_plays 2015-04-04 10:24:03 -04:00
Toshio Kuratomi
349ecf6efe Add a vault test to data_loader test and some additional yaml tests to parsing/yaml/test_loader 2015-04-03 11:39:56 -07:00
Brian Coca
3c6fdebfe3 made listhosts play output name more consistent internally 2015-04-03 13:49:00 -04:00