James Cammarata
4fd4f3374a
Merge pull request #12879 from larsks/bug/12876
...
allow include: directive to work during exception processing
2015-10-22 22:15:32 -04:00
Lars Kellogg-Stedman
914f68f9af
allow include: directive to work during exception processing
...
prior to this commit, an attempt to use the `include:` directive would
fail in a `rescue:` or `always:` block if there were failures in the
main block task list.
Resolves #12876 .
2015-10-22 22:12:20 -04:00
Toshio Kuratomi
ce2b18174e
Merge pull request #12878 from ansible/invocation-fix
...
Invocation fix
2015-10-22 16:17:40 -07:00
Toshio Kuratomi
2e87c1f74e
Two fixes to action plugins
...
* Fix the task_vars parameter to not default to a mutable type (dict)
* Implement invocation in the base class's run() method have each action
module call the run() method's implemention in the base class.
* Return values from the action plugins' run() method takes the return
value from the base class run() method into account so that invocation
makes its way to the output.
Fixes #12869
2015-10-22 16:07:26 -07:00
Brian Coca
5017a96948
Revert "make callbacks declare needing whitelisting"
...
another premature merge
This reverts commit df8ff85787
2015-10-22 16:34:51 -04:00
Brian Coca
3c1c5b060c
Revert "Add slack callback plugin"
...
premature merge
This reverts commit 8713b999da
2015-10-22 16:29:01 -04:00
James Cammarata
86de1429e5
Cleaning up FIXMEs
2015-10-22 16:03:50 -04:00
Toshio Kuratomi
1e50d31cdc
Update submodule refs
2015-10-22 10:14:31 -07:00
Brian Coca
43c1d0046b
added ecs modules to changelog
2015-10-22 12:30:23 -04:00
Matt Martz
8713b999da
Add slack callback plugin
2015-10-22 12:30:23 -04:00
Brian Coca
df8ff85787
make callbacks declare needing whitelisting
...
this will allow for custom or v1 callbacks locally loaded to automatically be triggered as they were in 1.x
2015-10-22 12:30:23 -04:00
Toshio Kuratomi
75cff7129c
Fix for invocation not being added to output.
...
We want invocation to be omitted when we are running async, not when we
aren't running async.
2015-10-22 09:03:35 -07:00
Toshio Kuratomi
ed6aa75d63
Add parsing test to travis to catch that invocation is missing
2015-10-22 09:03:12 -07:00
Toshio Kuratomi
6b6d03290a
Restore the automatic addition of invocation to the output
...
Revert "Remove auto-added invocation return value as it is not used by v2 and could leak sensitive data."
This reverts commit 6ce6b202685c016224575177cb3f74
2015-10-22 08:53:37 -07:00
James Cammarata
498c27d09a
Re-adding role_names magic variable
...
Fixes #12863
2015-10-22 11:06:47 -04:00
Brian Coca
404ded2b03
Merge pull request #12868 from docschick/docschick-fixes
...
variables precedence reordering and added para …
2015-10-22 09:27:09 -04:00
Sandra Wills
bc14ed380e
variables precedence reordering and added para to help explain precedence rules
2015-10-22 09:12:43 -04:00
Brian Coca
09899b7c43
Merge pull request #12783 from larsks/bug/12782
...
correct value of remote_user for local connections
2015-10-22 08:10:07 -04:00
Brian Coca
54e821ca94
added deprecation warning to comma separated role spec
2015-10-22 08:10:51 -04:00
Brian Coca
9886829e40
Merge pull request #12861 from willthames/galaxy_spec_in_meta_main_fix
...
Allow meta/main.yml to include roles through spec file
2015-10-22 08:01:02 -04:00
Brian Coca
d861e7dd5d
moved several directives so they are not settable at play, block, role and task levels
2015-10-22 07:51:22 -04:00
Brian Coca
fc3a44485b
skip errors on conditional if task is include
...
fixes #12843
2015-10-22 07:50:43 -04:00
Brian Coca
cc41354733
Merge pull request #12865 from aidanhs/aphs-document-env-vars-play
...
Document setting environment variables in a playbook
2015-10-22 07:18:14 -04:00
Aidan Hobson Sayers
9f8c4d716a
Document setting environment variables in a playbook
2015-10-22 12:07:54 +01:00
Will Thames
002972c6cf
Allow meta/main.yml to include roles through spec file
...
ansible-playbook now works when run with a playbook
that includes a role that includes another role
specified using csv format
Updated one of the roles used in the tests to fix
broken tests - `make test_galaxy` now works
Fixes #11486 . Also addresses the problem alluded to in #10620 .
2015-10-22 13:30:42 +10:00
Brian Coca
08c9e70307
made display part of variable manager and corrected reference to it
...
fixes #12859
2015-10-21 22:29:27 -04:00
Brian Coca
aac20aa076
removed unused exception vars
2015-10-21 22:29:27 -04:00
James Cammarata
2b3c5aa41e
Support cmd param in Tasks by assigning it to _raw_params
...
Fixes #12856
2015-10-21 15:47:09 -04:00
Toshio Kuratomi
5a0e63af1e
Workaround seeming bug in python-2.6's sys.exit()
2015-10-21 11:54:02 -07:00
James Cammarata
c642fe4b84
Merge branch 'mathieumd-devel' into devel
2015-10-21 14:04:57 -04:00
James Cammarata
0e447e3f41
Merge branch 'devel' of https://github.com/mathieumd/ansible into mathieumd-devel
2015-10-21 13:59:51 -04:00
James Cammarata
4b20884719
Return correct changed flag when using check mode with template and force=no
...
Fixes #12844
2015-10-21 13:51:39 -04:00
Brian Coca
07d584c0a7
make - replacement in group names optional
2015-10-21 13:18:32 -04:00
Brian Coca
04aa7701d1
fix prompt, static methods don't get 'self'
...
fixes #12833
2015-10-21 12:06:29 -04:00
Toshio Kuratomi
42ce3de8d0
Merge pull request #12853 from ansible/winrm-return-bytes
...
In v2, exec_command should return bytes and the caller will take responsibility for converting to unicode
2015-10-21 08:42:54 -07:00
Toshio Kuratomi
3d57a202b5
And another fix for docs
2015-10-21 08:40:30 -07:00
Toshio Kuratomi
9dc9a606f6
Correct docs build
2015-10-21 08:36:21 -07:00
Toshio Kuratomi
632d356d22
Update submodule refs
2015-10-21 08:31:58 -07:00
Toshio Kuratomi
6e5055e786
Update the use of no_log values to cover everything that heuristic_log_sanitize does.
...
Fixes #12792
2015-10-21 08:15:46 -07:00
James Cammarata
ec56b29ba4
Fix setting of interpreter values for delegated hosts
...
Fixes #12772
2015-10-21 11:05:45 -04:00
Toshio Kuratomi
c845181dc1
In v2, exec_command should return bytes and the caller will take responsibility for converting to unicode
2015-10-21 07:59:46 -07:00
James Cammarata
63a1416754
Merge pull request #12849 from bborysenko/docsite/handlers_order
...
Fix order of handlers that were notified in different sections
2015-10-21 10:09:38 -04:00
Chris Meyers
6c265cde49
invoke systemd test for ubuntu >= 15.04 else invoke upstart test
2015-10-21 09:15:27 -04:00
Borys Borysenko
126276ce6c
Fix order of handlers that were notified in different sections
2015-10-21 11:00:47 +03:00
Toshio Kuratomi
6b419db9fa
Merge pull request #12847 from godfreyduke/devel
...
Remove mutable default arguments.
2015-10-20 23:25:49 -07:00
gduke
744679601f
Remove mutable default arguments.
2015-10-20 22:13:23 -07:00
Toshio Kuratomi
10e2fc6f60
Update submodule ref
2015-10-20 15:37:50 -07:00
Toshio Kuratomi
1126ce34e3
Merge pull request #12846 from ansible/nolog-for-return-value
...
Hide values in json returns which were given in parameters marked no_log.
2015-10-20 15:28:16 -07:00
Monty Taylor
cac00add8d
Update to final shade inventory interface
...
shade has an inventory interface that is cleaner. We should use it.
2015-10-21 06:13:50 +09:00
Toshio Kuratomi
c2d188baff
Hide values in json returns which were given in parameters marked no_log.
2015-10-20 12:42:36 -07:00
