Brian Coca
8ce864db6f
sanatize results
2015-10-24 15:23:12 -04:00
Brian Coca
368f4448dc
simplified vault password functions
...
also fixes #12864
2015-10-24 15:06:43 -04:00
Toshio Kuratomi
92dd563a75
Fix invocation from bad merge and note where it would need to go to keep
...
it out of registered vars as well.
2015-10-24 07:29:42 -07:00
Brian Coca
f78c82b9ee
don't set user to current user
...
also remove condition to bypass setting user if user matches current user
this enables forcing user when set to the same user as current user and ignoring .ssh/config
while keeping .ssh/config with current user if nothing is specified.
2015-10-23 23:15:45 -04:00
Brian Coca
25e3fe04a8
finalized changed to use abridtged_result instead of result
...
removed no longer defined no_log
2015-10-23 23:10:57 -04:00
Toshio Kuratomi
b109b83809
Update submodule refs
2015-10-23 14:34:40 -07:00
Toshio Kuratomi
1644eeb6be
Merge pull request #12892 from ansible/synchronize-remote-to-itself
...
Potential fix for #12816
2015-10-23 13:45:03 -07:00
Toshio Kuratomi
ca32d5bacc
Potential fix for #12816
2015-10-23 13:38:44 -07:00
James Cammarata
3eea4e23d5
Manually add plugin directories when running the adhoc command
...
Fixes #12891
2015-10-23 16:33:51 -04:00
Toshio Kuratomi
3812ec8d1d
Implement invocation hiding for all callbacks if the verbosity is low
2015-10-23 11:11:34 -07:00
Brian Coca
275764d4a5
avoid showing invokation when no_log is set or verbosity is low
2015-10-23 14:06:20 -04:00
James Cammarata
63ea614b4c
Version bump for 2.0.0-0.4.beta2
2015-10-23 13:34:30 -04:00
Toshio Kuratomi
99c6f77e59
Fix callback
2015-10-23 09:15:22 -07:00
Brian Coca
08ca749c94
added deploy_helper
2015-10-23 11:50:20 -04:00
Brian Coca
6637982deb
added docs for include with_items and usage of multiple lopo vars (item)
2015-10-23 10:32:31 -04:00
Brian Coca
be82e4c614
Merge pull request #10362 from emonty/fix-kwarg
...
Clean up OpenStack inventory to use a cleaner interface
2015-10-23 08:37:50 -04:00
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
